Changeset 4293

Timestamp:

04/25/2011 10:25:17 AM (15 years ago)

Author:

djpaul

Message:

Revert r4292:4290. See #3178

File:

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

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

@@ -67 +67 @@
                         );
 
-                        // Only show permalinks panel if we don't already use them
-                        if ( !empty( $wp_rewrite->permalink_structure ) ) {
-                                unset( $steps[2] );
-
-                                // Reset the keys by merging with an empty array
-                                $steps = array_merge( array(), $steps );
-                        }
-
                 // Update wizard steps
                 } else {
@@ -271 +263 @@
                 else
                         $blogs_slug = 'blogs';
-
-                // Call up old bp-pages to see if a page has been previously linked to Blogs
+ 
+                // 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' );
@@ -782 +774 @@
                                 $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;
 
@@ -1015 +1007 @@
                         @setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
 
-                        // Load BP, so that the redirect is successful
+                        // Load BP, so that the redirect is successful                  
                         require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-loader.php' );
 
@@ -1079 +1071 @@
 
         require_once( dirname( __FILE__ ) . '/bp-core-schema.php' );
-
+        
         // Core DB Tables
         bp_core_install_notifications();
@@ -1292 +1284 @@
 function bp_core_update_get_page_meta() {
         $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 );
 }