Changeset 16558

Timestamp:

11/24/2010 12:19:38 AM (14 years ago)

Author:

ryan

Message:

Load network plugins for wp-activate.php. Restore MU load order. Props blamenacin. fixes #14718

Location:

trunk

Files:

• wp-includes/load.php (modified) (2 diffs)
• wp-includes/ms-load.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/load.php

@@ -473 +473 @@
     $active_plugins = (array) get_option( 'active_plugins', array() );
 
-    // Get active network plugins
-    if ( is_multisite() ) {
-        $active_sitewide_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-        if ( !empty($active_sitewide_plugins) ) {
-            $active_plugins = array_merge( $active_plugins, array_keys( $active_sitewide_plugins ) );
-            sort( $active_plugins );
-        }
-    }
-
     // Check for hacks file if the option is enabled
     if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) ) {
@@ -491 +482 @@
         return $plugins;
 
+    $network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
+
     foreach ( $active_plugins as $plugin ) {
         if ( ! validate_file( $plugin ) // $plugin must validate as file
             && '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
             && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+            // not already included as a network plugin
+            && ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
             )
         $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;

trunk/wp-includes/ms-load.php

@@ -24 +24 @@
 
     return false;
+}
+
+/**
+ * Returns array of network plugin files to be included in global scope.
+ *
+ * The default directory is wp-content/plugins. To change the default directory
+ * manually, define <code>WP_PLUGIN_DIR</code> and <code>WP_PLUGIN_URL</code>
+ * in wp-config.php.
+ *
+ * @access private
+ * @since 3.1.0
+ * @return array Files to include
+ */
+function wp_get_active_network_plugins() {
+    $active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
+    if ( empty( $active_plugins ) )
+        return array();
+
+    $active_plugins = array_keys( $active_plugins );
+    sort( $active_plugins );
+
+    foreach ( $active_plugins as $plugin ) {
+        if ( ! validate_file( $plugin ) // $plugin must validate as file
+            && '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
+            && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+            )
+        $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+    }
+    return $plugins;
 }
 

trunk/wp-settings.php

@@ -156 +156 @@
 unset( $mu_plugin );
 
+// Load network activated plugins.
+if ( is_multisite() ) {
+    foreach( wp_get_active_network_plugins() as $network_plugin ) {
+        include_once( $network_plugin );
+    }
+    unset( $network_plugin );
+}
+
 do_action( 'muplugins_loaded' );