Changeset 4254

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

Location:

trunk/bp-core

Files:

• admin/bp-core-update.php (modified) (5 diffs)
• bp-core-functions.php (modified) (3 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 );
 }
 

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

@@ -17 +17 @@
  *
  * @package BuddyPress Core
+ * @since 1.3
+ *
+ * @todo Remove the "Upgrading from an earlier version of BP pre-1.3" block. Temporary measure for
+ *       people running trunk installations. Leave for a version or two, then remove.
  */
 function bp_core_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;
+    
+    // Upgrading from an earlier version of BP pre-1.3
+    if ( empty( $page_ids ) || isset( $page_ids['members'] ) ) {        
+        if ( empty( $page_ids ) ) {     
+            // We're probably coming from an old multisite install
+            $old_page_ids = get_blog_option( $page_blog_id, 'bp-pages' );
+        } else {
+            // We're probably coming from an old single-WP install
+            $old_page_ids = $page_ids;
+        }
+        
+        /**
+         * If $page_ids is found in a blog_option, and it's formatted in the new way (keyed
+         * by blog_id), it means that this is an MS upgrade. Return false and let the
+         * upgrade wizard handle the migration.
+         */
+        if ( !isset( $old_page_ids['members'] ) )
+            return false;
+            
+        // Finally, move the page ids over to site options
+        $new_page_ids = array(
+            $page_blog_id => $old_page_ids
+        );
+
+        update_site_option( 'bp-pages', $new_page_ids );
+    }
+    
+    $blog_page_ids = !empty( $page_ids[$page_blog_id] ) ? $page_ids[$page_blog_id] : false;
+    
+    return apply_filters( 'bp_core_get_page_meta', $blog_page_ids );
 }
 
@@ -30 +63 @@
  * Stores BP pages in the meta table, depending on setup
  *
- * bp-pages data is stored in the options table of the root blog, except when BP_ENABLE_MULTIBLOG
- * is turned on.
+ * bp-pages data is stored in site_options (falls back to options on non-MS), in an array keyed by
+ * blog_id. This allows you to change your BP_ROOT_BLOG and go through the setup process again.
  *
  * @package BuddyPress Core 
  * @since 1.3
  *
- * @param array $page_ids The IDs of the WP pages corresponding to BP component directories
- */
-function bp_core_update_page_meta( $page_ids ) {
-    if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
-        update_blog_option( BP_ROOT_BLOG, 'bp-pages', $page_ids );
-    else
-        update_option( 'bp-pages', $page_ids );
+ * @param array $blog_page_ids The IDs of the WP pages corresponding to BP component directories
+ */
+function bp_core_update_page_meta( $blog_page_ids ) {
+    if ( !$page_ids = get_site_option( 'bp-pages' ) )
+        $page_ids = array();
+
+    // Generally, we key by the BP_ROOT_BLOG. Exception: when BP_ENABLE_MULTIBLOG is turned on
+    $key = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? get_current_blog_id() : BP_ROOT_BLOG;
+    
+    $page_ids[$key] = $blog_page_ids;
+
+    update_site_option( 'bp-pages', $page_ids );
 }
 
@@ -64 +102 @@
         $posts_table_name = is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ? $wpdb->get_blog_prefix( BP_ROOT_BLOG ) . 'posts' : $wpdb->posts;
         $page_ids_sql     = implode( ',', (array)$page_ids );
-        $page_names       = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) AND post_status = 'publish' " ) );
+        $page_names       = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent, post_title FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) AND post_status = 'publish' " ) );
 
         foreach ( (array)$page_ids as $key => $page_id ) {
             foreach ( (array)$page_names as $page_name ) {
                 if ( $page_name->ID == $page_id ) {
-                    $pages->{$key}->name = $page_name->post_name;
-                    $pages->{$key}->id   = $page_name->ID;
-                    $slug[]              = $page_name->post_name;
+                    $pages->{$key}->name  = $page_name->post_name;
+                    $pages->{$key}->id    = $page_name->ID;
+                    $pages->{$key}->title = $page_name->post_title;
+                    $slug[]               = $page_name->post_name;
 
                     // Get the slug