Changeset 7192 for trunk/bp-loader.php

Timestamp:

06/09/2013 01:39:07 PM (11 years ago)

Author:

boonebgorges

Message:

Refines the way that BP_ROOT_BLOG is calculated on multisite installations

BP was originally a 'network: true' plugin, making it possible to assume blog 1
as the default value of BP_ROOT_BLOG on a multisite installation, unless
otherwise declared. When the network-only restriction was lifted, it became
possible to activate BP only on a secondary site in a network, in which case
the default value 1 of BP_ROOT_BLOG no longer applies.

This changeset reworks the logic used to calculate BP_ROOT_BLOG, starting with
the assumption that it is the current blog, and only changing it to the
current site's blog_id (blog 1, in non-multi-network setups) when the plugin
is indeed network-activated.

This fixes a number of problems, notably one where it was impossible to set up
the bp-pages associations, because the Pages dropdowns were populated from blog
1 when BP was active only on a secondary blog of a network.

Fixes #4917

Props r-a-y

File:

• trunk/bp-loader.php (modified) (2 diffs)

trunk/bp-loader.php

@@ -224 +224 @@
             require( WP_PLUGIN_DIR . '/bp-custom.php' );
 
-        // Define on which blog ID BuddyPress should run
-        if ( !defined( 'BP_ROOT_BLOG' ) ) {
-
-            // Default to 1
-            $root_blog_id = 1;
-
-            // Root blog is the main site on this network
-            if ( is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
-                $current_site = get_current_site();
-                $root_blog_id = $current_site->blog_id;
-
-            // Root blog is every site on this network
-            } elseif ( is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) ) {
-                $root_blog_id = get_current_blog_id();
-            }
-
-            define( 'BP_ROOT_BLOG', $root_blog_id );
+        // Path and URL
+        if ( ! defined( 'BP_PLUGIN_DIR' ) ) {
+            define( 'BP_PLUGIN_DIR', trailingslashit( WP_PLUGIN_DIR . '/buddypress' ) );
         }
 
-        // Path and URL
-        if ( !defined( 'BP_PLUGIN_DIR' ) )
-            define( 'BP_PLUGIN_DIR', trailingslashit( WP_PLUGIN_DIR . '/buddypress' ) );
-
-        if ( !defined( 'BP_PLUGIN_URL' ) ) {
+        if ( ! defined( 'BP_PLUGIN_URL' ) ) {
             $plugin_url = plugin_dir_url( __FILE__ );
 
@@ -255 +237 @@
 
             define( 'BP_PLUGIN_URL', $plugin_url );
+        }
+
+        // Define on which blog ID BuddyPress should run
+        if ( ! defined( 'BP_ROOT_BLOG' ) ) {
+
+            // Default to use current blog ID
+            // Fulfills non-network installs and BP_ENABLE_MULTIBLOG installs
+            $root_blog_id = get_current_blog_id();
+
+            // Multisite check
+            if ( is_multisite() ) {
+
+                // Multiblog isn't enabled
+                if ( ! defined( 'BP_ENABLE_MULTIBLOG' ) || ( defined( 'BP_ENABLE_MULTIBLOG' ) && (int) constant( 'BP_ENABLE_MULTIBLOG' ) === 0 ) ) {
+                    // Check to see if BP is network-activated
+                    // We're not using is_plugin_active_for_network() b/c you need to include the
+                    // /wp-admin/includes/plugin.php file in order to use that function.
+
+                    // get network-activated plugins
+                    $plugins = get_site_option( 'active_sitewide_plugins');
+                    
+                    // basename
+                    $basename = plugin_basename( constant( 'BP_PLUGIN_DIR' ) . 'bp-loader.php' );
+
+                    // plugin is network-activated; use main site ID instead
+                    if ( isset( $plugins[ $basename ] ) ) {
+                        $current_site = get_current_site();
+                        $root_blog_id = $current_site->blog_id;
+                    }
+                }
+
+            }
+
+            define( 'BP_ROOT_BLOG', $root_blog_id );
         }