Changeset 5202 for trunk/bp-core/admin/bp-core-update.php

Timestamp:

09/30/2011 08:42:53 PM (13 years ago)

Author:

boonebgorges

Message:

Make sure that page data is pulled from the proper root blog when populating dropdowns and 'automatically create a page' text on Pages step of wizard. Fixes #3639

File:

• trunk/bp-core/admin/bp-core-update.php (modified) (4 diffs)

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

@@ -266 +266 @@
 
     function step_ms_update() {
+        global $wpdb;
+
+        // Make sure that page info is pulled from bp_get_root_blog_id() (except when in
+        // multisite mode)
+        if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
+            switch_to_blog( bp_get_root_blog_id() );
+
         if ( !current_user_can( 'activate_plugins' ) )
             return false;
@@ -337 +344 @@
         </div>
 
-    <?php
+        <?php
+
+        restore_current_blog();
     }
 
@@ -363 +372 @@
 
     function step_pages() {
-        global $bp;
+        global $bp, $wpdb;
+
+        // Make sure that page info is pulled from bp_get_root_blog_id() (except when in
+        // multisite mode)
+        if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
+            switch_to_blog( bp_get_root_blog_id() );
 
         if ( !current_user_can( 'activate_plugins' ) )
@@ -527 +541 @@
         </div>
 
-    <?php
+        <?php
+
+        restore_current_blog();
     }