Ticket #3178: 3178.002.diff

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

@@ -58 +58 @@
                 $steps = array();
 
                 if ( 'install' == $this->setup_type ) {
-                        $steps = array(
-                                __( 'Components', 'buddypress' ),
-                                __( 'Pages',      'buddypress' ),
-                                __( 'Permalinks', 'buddypress' ),
-                                __( 'Theme',      'buddypress' ),
-                                __( 'Finish',     'buddypress' )
-                        );
 
+                        // Only show pretty permalinks panel if we don't already use them
+                        if ( empty( $wp_rewrite->permalink_structure ) ) {
+                                $steps = array(
+                                        __( 'Components', 'buddypress' ),
+                                        __( 'Pages',      'buddypress' ),
+                                        __( 'Permalinks', 'buddypress' ),
+                                        __( 'Theme',      'buddypress' ),
+                                        __( 'Finish',     'buddypress' )
+                                );
+                        } else {
+                                $steps = array(
+                                        __( 'Components', 'buddypress' ),
+                                        __( 'Pages',      'buddypress' ),
+                                        __( 'Theme',      'buddypress' ),
+                                        __( 'Finish',     'buddypress' )
+                                );
+                        }
+
                 // Update wizard steps
                 } else {
                         if ( $this->is_network_activate )
@@ -262 +273 @@
                         $blogs_slug = constant( 'BP_BLOGS_SLUG' );
                 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' );
                 $existing_pages         = $existing_pages_data[$page_blog_id];
@@ -773 +784 @@
                                 $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 );
@@ -1006 +1017 @@
                         // Delete the setup cookie
                         @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' );
 
                         // Redirect to the BuddyPress dashboard
@@ -1070 +1081 @@
                 $active_components = apply_filters( 'bp_active_components', get_site_option( 'bp-active-components' ) );
 
         require_once( dirname( __FILE__ ) . '/bp-core-schema.php' );
-        
+
         // Core DB Tables
         bp_core_install_notifications();
 
@@ -1283 +1294 @@
  */
 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 );
 }