From 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 12 Oct 2007 16:21:15 +0000
Subject: Merge with WP 2.3 - testing use only! Move pluggable functions out of
 wpmu-functions and into pluggable.php, fixes #439

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/import.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'wp-admin/import.php')

diff --git a/wp-admin/import.php b/wp-admin/import.php
index 8c46046..9637279 100644
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -14,9 +14,9 @@ require_once ('admin-header.php');
 // Load all importers so that they can register.
 $import_loc = 'wp-admin/import';
 $import_root = ABSPATH.$import_loc;
-$imports_dir = @ dir($import_root);
+$imports_dir = @ opendir($import_root);
 if ($imports_dir) {
-	while (($file = $imports_dir->read()) !== false) {
+	while (($file = readdir($imports_dir)) !== false) {
 		if ($file{0} == '.') {
 			continue;
 		} elseif (substr($file, -4) == '.php') {
@@ -24,6 +24,7 @@ if ($imports_dir) {
 		}
 	}
 }
+@closedir($imports_dir);
 
 $importers = get_importers();
 
-- 
cgit