From 81ec5c6d42d68a0be88095044d5bbf1984fecf34 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Mon, 10 May 2010 20:40:15 +0000 Subject: [PATCH] Apply [14540] to get_mu_plugins and get_dropins. fixes #13322, props Miloslav. git-svn-id: https://develop.svn.wordpress.org/trunk@14545 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/plugin.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 08b736c788..b8f2f8d56f 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -288,11 +288,13 @@ function get_mu_plugins() { if ( substr( $file, -4 ) == '.php' ) $plugin_files[] = $file; } + } else { + return $wp_plugins; } @closedir( $plugins_dir ); - if ( !$plugins_dir || empty($plugin_files) ) + if ( empty($plugin_files) ) return $wp_plugins; foreach ( $plugin_files as $plugin_file ) { @@ -333,12 +335,14 @@ function get_dropins() { if ( isset( $_dropins[ $file ] ) ) $plugin_files[] = $file; } + } else { + return $dropins; } @closedir( $plugins_dir ); - if ( !$plugins_dir || empty($plugin_files) ) - return $dropins; + if ( empty($plugin_files) ) + return $dropins; foreach ( $plugin_files as $plugin_file ) { if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) )