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

Timestamp:

04/23/2011 04:23:34 PM (14 years ago)

Author:

boonebgorges

Message:

Moves bp-pages data to a single site_option, an array keyed by blog_id. Fixes #3144

File:

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

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

@@ -263 +263 @@
         else
             $blogs_slug = 'blogs';
-
-        if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
-            $existing_pages = get_blog_option( BP_ROOT_BLOG, 'bp-pages' );
-        else
-            $existing_pages = get_option( 'bp-pages' );
+ 
+        // Call up old bp-pages to see if a page has been previously linked to Blogs 
+        $page_blog_id       = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? get_current_blog_id() : BP_ROOT_BLOG;
+        $existing_pages_data    = get_blog_option( $page_blog_id, 'bp-pages' );
+        $existing_pages     = $existing_pages_data[$page_blog_id];
 
         if ( !empty( $existing_pages['blogs'] ) )
@@ -362 +362 @@
             return false;
 
-        // Determine where to get the pages from
-        if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
-            $existing_pages = get_blog_option( BP_ROOT_BLOG, 'bp-pages' );
-        else
-            $existing_pages = get_option( 'bp-pages' );
+        $existing_pages = bp_core_update_get_page_meta();
 
         // Get active components
@@ -774 +770 @@
                     switch_to_blog( BP_ROOT_BLOG );
 
-                $existing_pages = get_option( 'bp-pages' );
-                $bp_pages       = $this->setup_pages( (array)$_POST['bp_pages'] );
-                $bp_pages       = array_merge( (array)$existing_pages, (array)$bp_pages );
-
-                update_option( 'bp-pages', $bp_pages );
+                // Move bp-pages data from the blog options table to site options
+                $page_blog_id       = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? get_current_blog_id() : BP_ROOT_BLOG;
+                $existing_pages_data    = get_blog_option( $page_blog_id, 'bp-pages' );
+                $existing_pages     = $existing_pages_data[$page_blog_id];
+                
+                $bp_pages           = $this->setup_pages( (array)$_POST['bp_pages'] );
+                $bp_pages           = array_merge( (array)$existing_pages, (array)$bp_pages );
+                
+                $existing_pages_data[$page_blog_id] = $bp_pages;
+
+                update_site_option( 'bp-pages', $existing_pages_data );
 
                 if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != BP_ROOT_BLOG ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
@@ -832 +834 @@
                 wp_delete_post( $page_id, true );
 
-            $bp_pages = $this->setup_pages( (array)$_POST['bp_pages'] );
-
-            update_option( 'bp-pages', $bp_pages );
+            $blog_pages     = $this->setup_pages( (array)$_POST['bp_pages'] );
+            $page_blog_id   = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? get_current_blog_id() : BP_ROOT_BLOG;
+            $bp_pages   = array( $page_blog_id => $blog_pages );
+
+            update_site_option( 'bp-pages', $bp_pages );
 
             if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != BP_ROOT_BLOG ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
@@ -1276 +1280 @@
  */
 function bp_core_update_get_page_meta() {
-    if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
-        $page_ids = get_blog_option( BP_ROOT_BLOG, 'bp-pages' );
-    else
-        $page_ids = get_option( 'bp-pages' );
-
-    return $page_ids;
+    $page_ids = get_site_option( 'bp-pages' );
+    
+    $is_enable_multiblog = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? true : false;
+
+    $page_blog_id = $is_enable_multiblog ? get_current_blog_id() : BP_ROOT_BLOG;
+    
+    $blog_page_ids = !empty( $page_ids[$page_blog_id] ) ? $page_ids[$page_blog_id] : false;
+    
+    return apply_filters( 'bp_core_update_get_page_meta', $blog_page_ids );
 }