Changeset 3464

Timestamp:

11/21/2010 04:58:53 PM (15 years ago)

Author:

boonebgorges

Message:

Modifies bp_core_get_site_options() to fetch options that are blog-specific even when Network is activated. Fixes #2756

Location:

trunk

Files:

• bp-core.php (modified) (1 diff)
• bp-core/admin/bp-core-upgrade.php (modified) (1 diff)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-loader.php (modified) (3 diffs)

trunk/bp-core.php

@@ -15 +15 @@
 if ( file_exists( WP_PLUGIN_DIR . '/bp-custom.php' ) )
     require( WP_PLUGIN_DIR . '/bp-custom.php' );
-
-/* Define on which blog ID BuddyPress should run */
-if ( !defined( 'BP_ROOT_BLOG' ) )
-    define( 'BP_ROOT_BLOG', 1 );
 
 /* Define the user and usermeta table names, useful if you are using custom or shared tables. */

trunk/bp-core/admin/bp-core-upgrade.php

@@ -825 +825 @@
             $options = array(
                 'bp-db-version' => $this->current_version,
-                'bp-deactivated-components' => $disabled
+                'bp-deactivated-components' => $disabled,
+                'avatar-default' => get_option( 'avatar-default' )
             );
             bp_core_activate_site_options( $options );

trunk/bp-core/bp-core-catchuri.php

@@ -195 +195 @@
 
     // Remove the username from action variables if this is not a VHOST install
-    if ( defined( 'VHOST' ) && 'no' == VHOST && !$is_root_component )
+    if ( defined( 'VHOST' ) && 'no' == VHOST && empty( $is_root_component ) )
         array_shift($bp_uri);
 

trunk/bp-loader.php

@@ -12 +12 @@
 define( 'BP_VERSION', '1.3-bleeding' );
 define( 'BP_DB_VERSION', 1225 );
+
+// Define on which blog ID BuddyPress should run
+if ( !defined( 'BP_ROOT_BLOG' ) )
+    define( 'BP_ROOT_BLOG', 1 );
 
 /***
@@ -89 +93 @@
     global $bp, $wpdb;
 
-    $options = apply_filters( 'bp_core_site_options', array(
+    // These options come from the options table in WP single, and sitemeta in MS
+    $site_options = apply_filters( 'bp_core_site_options', array(
         'bp-deactivated-components',
         'bp-blogs-first-install',
@@ -103 +108 @@
         'hide-loggedout-adminbar',
 
-        /* Useful WordPress settings used often */
-        'user-avatar-default',
+        // Useful WordPress settings used often
         'tags_blog_id',
         'registration',
         'fileupload_maxk'
     ) );
+    
+    // These options always come from the options table of BP_ROOT_BLOG
+    $root_blog_options = apply_filters( 'bp_core_root_blog_options', array(
+        'avatar_default'
+    ) );
 
-    $meta_keys = "'" . implode( "','", (array)$options ) ."'";
+    $meta_keys = "'" . implode( "','", (array)$site_options ) ."'";
 
     if ( is_multisite() )
-        $meta = $wpdb->get_results( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ({$meta_keys}) AND site_id = {$wpdb->siteid}" );
+        $site_meta = $wpdb->get_results( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ({$meta_keys}) AND site_id = {$wpdb->siteid}" );
     else
-        $meta = $wpdb->get_results( "SELECT option_name AS name, option_value AS value FROM {$wpdb->options} WHERE option_name IN ({$meta_keys})" );
+        $site_meta = $wpdb->get_results( "SELECT option_name AS name, option_value AS value FROM {$wpdb->options} WHERE option_name IN ({$meta_keys})" );
+        
+    $root_blog_meta_keys = "'" . implode( "','", (array)$root_blog_options ) ."'";
+    
+    $root_blog_meta_table = BP_ROOT_BLOG == 1 ? $wpdb->base_prefix . 'options' : $wpdb->base_prefix . BP_ROOT_BLOG . '_options';
+    $root_blog_meta = $wpdb->get_results( $wpdb->prepare( "SELECT option_name AS name, option_value AS value FROM {$root_blog_meta_table} WHERE option_name IN ({$root_blog_meta_keys})" ) );
 
     $site_options = array();
-    if ( !empty( $meta ) ) {
-        foreach( (array)$meta as $meta_item )
-            $site_options[$meta_item->name] = $meta_item->value;
+    foreach( array( $site_meta, $root_blog_meta ) as $meta ) {
+        if ( !empty( $meta ) ) {
+            foreach( (array)$meta as $meta_item )
+                $site_options[$meta_item->name] = $meta_item->value;
+        }
     }
-
     return apply_filters( 'bp_core_get_site_options', $site_options );
 }