WordPress.org

Make WordPress Core

Changeset 17617


Ignore:
Timestamp:
04/07/11 09:07:56 (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/plugin.php

    r17310 r17617  
    244244                            $plugin_files[] = "$file/$subfile"; 
    245245                    } 
     246                    closedir( $plugins_subdir ); 
    246247                } 
    247248            } else { 
     
    250251            } 
    251252        } 
    252     } else { 
    253         return $wp_plugins; 
    254     } 
    255  
    256     @closedir( $plugins_dir ); 
    257     @closedir( $plugins_subdir ); 
     253        closedir( $plugins_dir ); 
     254    } 
    258255 
    259256    if ( empty($plugin_files) ) 
Note: See TracChangeset for help on using the changeset viewer.