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

Timestamp:

06/17/2012 08:43:45 PM (12 years ago)

Author:

djpaul

Message:

Update the updater to better handle switching from BP 1.5 to 1.6. See #4005.
Fixes a problem where after completing the DB update screen, all of the 'new
install' tabs were shown instead only the tabs relevant to the update.

File:

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

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

@@ -65 +65 @@
         } else {
 
-            if ( bp_get_db_version_raw() < (int) bp_get_db_version() ) {
-                $steps[] = __( 'Database Update', 'buddypress' );
-            }
-
             // New for BP 1.5
             if ( bp_get_db_version_raw() < 1801 || !bp_core_get_directory_page_ids() ) {
@@ -76 +72 @@
 
             // New for BP 1.6
-            if ( bp_get_db_version_raw() < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) ) {
+            if ( bp_get_db_version_raw() < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) )
                 $steps[] = __( 'Toolbar', 'buddypress' );
-            }
+
+            if ( bp_get_db_version_raw() < (int) bp_get_db_version() )
+                $steps[] = __( 'Database Update', 'buddypress' );
 
             $steps[] = __( 'Finish', 'buddypress' );
@@ -238 +236 @@
     ?>
 
-        <p><?php _e( 'Before you can continue using BuddyPress, a few minor adjustments need to be made. These changes are not destructive and will not remove or change any existing settings.', 'buddypress' ); ?></p>
+        <p><?php _e( 'To complete the update, a few changes need to be made to your database. These changes are not destructive and will not remove or change any existing settings.', 'buddypress' ); ?></p>
 
         <div class="submit clear">
@@ -661 +659 @@
     ?>
 
-        <p><?php _e( "BuddyPress now uses WordPress' Toolbar; this sits at the top of your site and contains various links to useful admin screens. We've turbo-charged the Toolbar by adding social items to help your users explore your site, and manage their content.", 'buddypress' ); ?></p>
+        <p><?php _e( "BuddyPress now uses the WordPress Toolbar; we've turbo-charged it by adding social items to help your users explore your site and manage their content.", 'buddypress' ); ?></p>
 
         <p><?php _e( "We've noticed that your site uses the old bar from earlier versions of BuddyPress.", 'buddypress' ); ?></p>