WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply [14540] to get_mu_plugins and get_dropins. fixes #13322, props Miloslav. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-05-10 20:40:15 +00:00
parent 41d8837397
commit f708a1bf38
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/plugin.php
View File

@ -288,11 +288,13 @@ function get_mu_plugins() {
if ( substr( $file, -4 ) == '.php' ) if ( substr( $file, -4 ) == '.php' )
$plugin_files[] = $file; $plugin_files[] = $file;
} }
} else {
return $wp_plugins;
} }
@closedir( $plugins_dir ); @closedir( $plugins_dir );
if ( !$plugins_dir || empty($plugin_files) ) if ( empty($plugin_files) )
return $wp_plugins; return $wp_plugins;
foreach ( $plugin_files as $plugin_file ) { foreach ( $plugin_files as $plugin_file ) {
@ -333,12 +335,14 @@ function get_dropins() {
if ( isset( $_dropins[ $file ] ) ) if ( isset( $_dropins[ $file ] ) )
$plugin_files[] = $file; $plugin_files[] = $file;
} }
} else {
return $dropins;
} }
@closedir( $plugins_dir ); @closedir( $plugins_dir );
if ( !$plugins_dir || empty($plugin_files) ) if ( empty($plugin_files) )
return $dropins; return $dropins;
foreach ( $plugin_files as $plugin_file ) { foreach ( $plugin_files as $plugin_file ) {
if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) ) if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) )