Changeset 5024

Timestamp:

08/22/2011 02:50:55 PM (13 years ago)

Author:

boonebgorges

Message:

Respect current_site when pulling up sitewide options with bp_core_get_root_options(). Fixes #3503. Props wpmuguru

File:

• trunk/bp-core/bp-core-functions.php (modified) (1 diff)

trunk/bp-core/bp-core-functions.php

@@ -977 +977 @@
         $network_option_keys    = array_keys( $network_options );
         $sitemeta_options_keys  = implode( "','", (array) $network_option_keys );
-        $sitemeta_options_query = sprintf( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ('%s')", $sitemeta_options_keys );
+        $current_site       = get_current_site();
+        $sitemeta_options_query = sprintf( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ('%s') AND site_id = %d", $sitemeta_options_keys, $current_site->id );
         $network_options_meta   = $wpdb->get_results( $sitemeta_options_query );