Changeset 4559 for trunk/bp-core/bp-core-loader.php

Timestamp:

06/24/2011 06:57:51 PM (15 years ago)

Author:

boonebgorges

Message:

Introduces bp_x_option() wrapper functions, along with bp_get_option_blog_id() to allow for fully filterable option storage. Refactors internal option storage to use new API functions. Fixes bp-pages for BP_ENABLE_MULTIBLOG. Fixes #3261

File:

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

trunk/bp-core/bp-core-loader.php

@@ -22 +22 @@
         require_once( BP_PLUGIN_DIR . '/bp-core/bp-core-adminbar.php'  );
 
+// Move active components from sitemeta, if necessary
+// Provides backpat with earlier versions of BP 
+if ( is_multisite() && $active_components = get_site_option( 'bp-active-components' ) )
+        bp_update_option( 'bp-active-components', $active_components );
+
 /** "And now for something completely different" ******************************/
 
@@ -67 +72 @@
 
                 // Get a list of activated components
-                if ( $active_components = get_site_option( 'bp-active-components' ) ) {
+                if ( $active_components = bp_get_option( 'bp-active-components' ) ) {
                         $bp->active_components      = apply_filters( 'bp_active_components', $active_components );
                         $bp->deactivated_components = apply_filters( 'bp_deactivated_components', array_values( array_diff( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), array_keys( $bp->active_components ) ) ) );
 
                 // Pre 1.3 Backwards compatibility
-                } elseif ( $deactivated_components = get_site_option( 'bp-deactivated-components' ) ) {
+                } elseif ( $deactivated_components = bp_get_option( 'bp-deactivated-components' ) ) {
                         // Trim off namespace and filename
                         foreach ( (array) $deactivated_components as $component => $value )