Changeset 17617 for trunk/wp-admin/includes/plugin.php

Timestamp:

04/07/2011 09:07:56 AM (15 years ago)

Author:

dd32

Message:

Move closedir() to better locations to prevent the need for error suppression, prevents suppressed Warnings/Notices to be thrown during Plugin Installation. Fixes #16547

File:

• trunk/wp-admin/includes/plugin.php (modified) (2 diffs)

trunk/wp-admin/includes/plugin.php

@@ -244 +244 @@
                                                         $plugin_files[] = "$file/$subfile";
                                         }
+                                        closedir( $plugins_subdir );
                                 }
                         } else {
@@ -250 +251 @@
                         }
                 }
-        } else {
-                return $wp_plugins;
-        }
-
-        @closedir( $plugins_dir );
-        @closedir( $plugins_subdir );
+                closedir( $plugins_dir );
+        }
 
         if ( empty($plugin_files) )