Ticket #11644: wpmu_sitewide_plugins.2.diff

wp-admin/includes/plugin.php

@@ -259 +259 @@
  * @return bool True, if in the active plugins list. False, not in the list.
  */
 function is_plugin_active( $plugin ) {
-        return in_array( $plugin, apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) ) );
+        return in_array( $plugin, (array) get_option( 'active_plugins', array() ) || is_plugin_active_for_network( $plugin );
 }
 
 /**
@@ -270 +270 @@
  * @param string $plugin Base plugin path from plugins directory.
  * @return bool True, if active for the network, otherwise false.
  */
-function is_plugin_active_for_network( $plugin ){
+function is_plugin_active_for_network( $plugin ) {
         if ( !is_multisite() )
                 return false;
 
@@ -553 +553 @@
  * @return array invalid plugins, plugin as key, error as value
  */
 function validate_active_plugins() {
-        $plugins = apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) );
+        $plugins = get_option( 'active_plugins', array() );
         // validate vartype: array
         if ( ! is_array( $plugins ) ) {
                 update_option( 'active_plugins', array() );
@@ -562 +562 @@
 
         if ( is_multisite() && is_super_admin() ) {
                 $network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-                $plugins = array_merge( (array) $plugins, $network_plugins );
+                $plugins = array_merge( $plugins, $network_plugins );
         }
 
         if ( empty( $plugins ) )

wp-admin/includes/upgrade.php

@@ -1074 +1074 @@
  * @since 3.0.0
  */
 function upgrade_network() {
+        global $wp_current_db_version;
         // 2.8
         if ( $wp_current_db_version < 11549 ) {
                 $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
@@ -1086 +1087 @@
 
                         update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
                 }
-                update_site_option( 'wpmu_sitewide_plugins', '' );
-                update_site_option( 'deactivated_sitewide_plugins', '' );
+                delete_site_option( 'wpmu_sitewide_plugins' );
+                delete_site_option( 'deactivated_sitewide_plugins' );
         }
 }
 

wp-includes/load.php

@@ -403 +403 @@
  */
 function wp_load_plugins() {
         $plugins = array();
+        $active_plugins = (array) get_option( 'active_plugins', array() );
 
-        // Check for hacks file if the option is enabled
-        if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) )
-                        $plugins[] = ABSPATH . 'my-hacks.php';
-
-        $active_plugins = (array) apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) );
-
         // Get active network plugins
         if ( is_multisite() ) {
                 $active_sitewide_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
@@ -419 +414 @@
                 }
         }
 
+        // Check for hacks file if the option is enabled
+        if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) ) {
+                _deprecated_file( 'my-hacks.php', '1.5' );
+                array_unshift( $plugins, ABSPATH . 'my-hacks.php' );
+        }
+
         if ( empty( $active_plugins ) || defined( 'WP_INSTALLING' ) )
                 return $plugins;