From 0afa04fccaaa387e0324a5d62d2a7905b7ddaa1d Mon Sep 17 00:00:00 2001 From: Austin Passy Date: Wed, 18 Nov 2015 13:28:32 -0800 Subject: [PATCH 1/2] Version bump --- mu-require.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mu-require.php b/mu-require.php index 2d1b6e2..c2c062c 100644 --- a/mu-require.php +++ b/mu-require.php @@ -3,7 +3,7 @@ * Plugin Name: MU plugins subdirectory loader * Plugin URI: https://github.com/wemakecustom/wp-mu-loader * Description: Enables the loading of plugins sitting in mu-plugins (as folders) - * Version: 1.0 + * Version: 1.1 * Author: WeMakeCustom * Author URI: http://www.wemakecustom.com/ * From f631e79189fe195790c1eacbad014cb4f6efd525 Mon Sep 17 00:00:00 2001 From: Austin Passy Date: Wed, 18 Nov 2015 13:29:22 -0800 Subject: [PATCH 2/2] Remove WP_INSTALLING check The WP_INSTALLING check can cause fatal errors for plugins reliant on mu-plugins during times that constant is defined. --- mu-loader.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mu-loader.php b/mu-loader.php index 93add61..233688b 100644 --- a/mu-loader.php +++ b/mu-loader.php @@ -3,11 +3,6 @@ function mu_loader_plugins_files() { - if (defined('WP_INSTALLING') && WP_INSTALLING === true) { - // Do nothing during installation - return array(); - } - // Cache plugins $plugins = get_site_transient('mu_loader_plugins'); @@ -22,7 +17,7 @@ function mu_loader_plugins_files() } } - if ($plugins === false) { + if ($plugins === false || $plugins === array()) { if (!function_exists('get_plugins')) { // get_plugins is not included by default require ABSPATH . 'wp-admin/includes/plugin.php';