Changeset 5867

Timestamp:

08/14/2007 02:58:33 AM (17 years ago)

Author:

ryan

Message:

Use opendir instead of dir. Props nbachiyski. fixes #4450

Location:

trunk

Files:

• wp-admin/import.php (modified) (2 diffs)
• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-admin/includes/upgrade.php (modified) (4 diffs)
• wp-includes/theme.php (modified) (3 diffs)

trunk/wp-admin/import.php

@@ -15 +15 @@
 $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;
@@ -25 +25 @@
     }
 }
+@closedir($imports_dir);
 
 $importers = get_importers();

trunk/wp-admin/includes/plugin.php

@@ -43 +43 @@
 
     // Files in wp-content/plugins directory
-    $plugins_dir = @ dir( $plugin_root);
+    $plugins_dir = @ opendir( $plugin_root);
     if ( $plugins_dir ) {
-        while (($file = $plugins_dir->read() ) !== false ) {
+        while (($file = readdir( $plugins_dir ) ) !== false ) {
             if ( substr($file, 0, 1) == '.' )
                 continue;
             if ( is_dir( $plugin_root.'/'.$file ) ) {
-                $plugins_subdir = @ dir( $plugin_root.'/'.$file );
+                $plugins_subdir = @ opendir( $plugin_root.'/'.$file );
                 if ( $plugins_subdir ) {
-                    while (($subfile = $plugins_subdir->read() ) !== false ) {
+                    while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
                         if ( substr($subfile, 0, 1) == '.' )
                             continue;
@@ -64 +64 @@
         }
     }
+    @closedir( $plugins_dir );
+    @closedir( $plugins_subdir );
 
     if ( !$plugins_dir || !$plugin_files )

trunk/wp-admin/includes/upgrade.php

@@ -1104 +1104 @@
     //$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
 
-    $theme_dir = @ dir("$default_dir");
+    $theme_dir = @ opendir("$default_dir");
     if ($theme_dir) {
-        while(($theme_file = $theme_dir->read()) !== false) {
+        while(($theme_file = readdir( $theme_dir )) !== false) {
             if (is_dir("$default_dir/$theme_file"))
                 continue;
@@ -1114 +1114 @@
         }
     }
+    @closedir($theme_dir);
 
     // Rewrite the theme header.
@@ -1137 +1138 @@
     }
 
-    $images_dir = @ dir("$default_dir/images");
+    $images_dir = @ opendir("$default_dir/images");
     if ($images_dir) {
-        while(($image = $images_dir->read()) !== false) {
+        while(($image = readdir($images_dir)) !== false) {
             if (is_dir("$default_dir/images/$image"))
                 continue;
@@ -1147 +1148 @@
         }
     }
+    @closedir($images_dir);
 }
 

trunk/wp-includes/theme.php

@@ -119 +119 @@
 
     // Files in wp-content/themes directory and one subdir down
-    $themes_dir = @ dir($theme_root);
+    $themes_dir = @ opendir($theme_root);
     if ( !$themes_dir )
         return false;
 
-    while ( ($theme_dir = $themes_dir->read()) !== false ) {
+    while ( ($theme_dir = readdir($themes_dir)) !== false ) {
         if ( is_dir($theme_root . '/' . $theme_dir) && is_readable($theme_root . '/' . $theme_dir) ) {
             if ( $theme_dir{0} == '.' || $theme_dir == '..' || $theme_dir == 'CVS' )
                 continue;
-            $stylish_dir = @ dir($theme_root . '/' . $theme_dir);
+            $stylish_dir = @ opendir($theme_root . '/' . $theme_dir);
             $found_stylesheet = false;
-            while ( ($theme_file = $stylish_dir->read()) !== false ) {
+            while ( ($theme_file = readdir($stylish_dir)) !== false ) {
                 if ( $theme_file == 'style.css' ) {
                     $theme_files[] = $theme_dir . '/' . $theme_file;
@@ -136 +136 @@
                 }
             }
+            @closedir($stylish_dir);
             if ( !$found_stylesheet ) { // look for themes in that dir
                 $subdir = "$theme_root/$theme_dir";
                 $subdir_name = $theme_dir;
-                $theme_subdir = @dir( $subdir );
-                while ( ($theme_dir = $theme_subdir->read()) !== false ) {
+                $theme_subdir = @ opendir( $subdir );
+                while ( ($theme_dir = readdir($theme_subdir)) !== false ) {
                     if ( is_dir( $subdir . '/' . $theme_dir) && is_readable($subdir . '/' . $theme_dir) ) {
                         if ( $theme_dir{0} == '.' || $theme_dir == '..' || $theme_dir == 'CVS' )
                             continue;
-                        $stylish_dir = @ dir($subdir . '/' . $theme_dir);
+                        $stylish_dir = @ opendir($subdir . '/' . $theme_dir);
                         $found_stylesheet = false;
-                        while ( ($theme_file = $stylish_dir->read()) !== false ) {
+                        while ( ($theme_file = readdir($stylish_dir)) !== false ) {
                             if ( $theme_file == 'style.css' ) {
                                 $theme_files[] = $subdir_name . '/' . $theme_dir . '/' . $theme_file;
@@ -153 +154 @@
                             }
                         }
+                        @closedir($stylish_dir);
                     }
                 }
+                @closedir($theme_subdir);
                 $wp_broken_themes[$theme_dir] = array('Name' => $theme_dir, 'Title' => $theme_dir, 'Description' => __('Stylesheet is missing.'));
             }
         }
     }
+    @closedir($theme_dir);
 
     if ( !$themes_dir || !$theme_files )