Changeset 5223 for trunk

Timestamp:

10/08/2011 06:46:09 PM (14 years ago)

Author:

djpaul

Message:

Switch to use the WP Admin Bar by default. See #3661

Location:

trunk

Files:

• bp-core/admin/bp-core-admin.php (modified) (2 diffs)
• bp-core/admin/bp-core-update.php (modified) (6 diffs)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-loader.php (modified) (1 diff)

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

@@ -79 +79 @@
             return false;
 
+        // "Switch to Admin Bar" is an optional option, so handle it here
+        if ( !empty( $_POST['bp-admin']['bp-force-buddybar'] ) ) {
+            unset( $_POST['bp-admin']['bp-force-buddybar'] );
+
+            // Switch to the WP Admin Bar by removing the BuddyBar override
+            bp_delete_option( 'bp-force-buddybar' );
+        }
+
         // Settings form submitted, now save the settings.
         foreach ( (array)$_POST['bp-admin'] as $key => $value )
@@ -164 +172 @@
                     <?php endif; ?>
 
+                    <?php if ( (bool) bp_get_option( 'bp-force-buddybar', false ) ) : ?>
+                        <tr>
+                            <th scope="row"><?php _e( 'Switch the site to the WordPress Admin Bar?', 'buddypress' ); ?></th>
+                            <td>
+                                <input type="checkbox" name="bp-admin[bp-force-buddybar]" value="1" id="bp-switch-to-admin-bar" />
+                            </td>
+                        </tr>
+                    <?php endif; ?>
+
                     <?php do_action( 'bp_core_admin_screen_fields' ) ?>
 

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

@@ -85 +85 @@
                 $steps[] = __( 'Database Update', 'buddypress' );
 
+            // New for BP 1.5
             if ( $this->database_version < 1801 || !bp_core_get_directory_page_ids() ) {
                 $steps[] = __( 'Components', 'buddypress' );
@@ -90 +91 @@
             }
 
+            // New for BP 1.6
+            if ( $this->database_version < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) )
+                $steps[] = __( 'Admin Bar', 'buddypress' );
+
             $steps[] = __( 'Finish', 'buddypress' );
         }
@@ -100 +105 @@
         // Save any posted values
         switch ( $step_name ) {
-            case 'db_update': default:
+            case 'db_update':
                 $result = $this->step_db_update_save();
                 break;
 
-            case 'ms_update': default:
+            case 'ms_update':
                 $result = $this->step_ms_update_save();
                 break;
 
-            case 'ms_pages': default:
+            case 'ms_pages':
                 $result = $this->step_ms_update_save();
                 break;
 
-            case 'components': default:
+            case 'components':
                 $result = $this->step_components_save();
                 break;
 
-            case 'pages': default:
+            case 'pages':
                 $result = $this->step_pages_save();
                 break;
 
-            case 'permalinks': default:
+            case 'permalinks':
                 $result = $this->step_permalinks_save();
                 break;
 
-            case 'theme': default:
+            case 'theme':
                 $result = $this->step_theme_save();
                 break;
 
-            case 'finish': default:
+            case 'admin_bar':
+                $result = $this->step_admin_bar_save();
+                break;
+
+            case 'finish':
+            default:
                 $result = $this->step_finish_save();
                 break;
@@ -233 +243 @@
                             break;
 
+                        case __( 'Admin Bar', 'buddypress' ) :
+                            $this->step_admin_bar();
+                            break;
+
                         case __( 'Finish', 'buddypress') :
                             $this->step_finish();
                             break;
-
                     } ?>
 
@@ -730 +743 @@
     }
 
+    /**
+     * When upgrading to BP 1.6, prompt the admin to switch to WordPress' admin bar.
+     *
+     * @since 1.6
+     */
+    function step_admin_bar() {
+        if ( !current_user_can( 'activate_plugins' ) )
+            return false;
+        ?>
+
+        <p><?php _e( "BuddyPress now uses WordPress' Admin Bar; this sits at the top of your site and contains various links to useful admin screens. We've turbo-charged the Admin Bar 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>
+
+        <p>
+            <label>
+                <input type="checkbox" name="keep_buddybar" value="1" />
+                <?php _e( "If you'd prefer to not switch to the WordPress Admin bar just yet, check this box. Don't worry, you can change your mind later.", 'buddypress' ); ?>
+            </label>
+        </p>
+
+        <div class="submit clear">
+            <input type="hidden" name="save" value="admin_bar" />
+            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step ); ?>" />
+
+            <?php wp_nonce_field( 'bpwizard_admin_bar' ) ?>
+        </div>
+
+        <?php
+    }
+
     function step_finish() {
         if ( !current_user_can( 'activate_plugins' ) )
@@ -1016 +1060 @@
             if ( is_multisite() )
                 restore_current_blog();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * When upgrading to BP 1.6, the admin is prompted to switch to WordPress' admin bar.
+     * If they choose not to, record that preference in the options table.
+     *
+     * @since 1.6
+     */
+    function step_admin_bar_save() {
+        if ( isset( $_POST['submit'] ) ) {
+            check_admin_referer( 'bpwizard_admin_bar' );
+
+            if ( !empty( $_POST['keep_buddybar'] ) )
+                bp_update_option( 'bp-force-buddybar', 1 );
 
             return true;

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

@@ -1289 +1289 @@
  *
  * The WP Admin Bar, introduced in WP 3.1, is fully supported in BuddyPress as of BP 1.5.
- *
- * For the BP 1.5 development cycle, the BuddyBar will remain the default navigation for BP
- * installations. In the future, this behavior will be changed, so that the WP Admin Bar is the
- * default.
- *
- * @package BuddyPress
- * @since 1.5
- *
+ * For BP 1.6, the WP Admin Bar is the default.
+ *
+ * @return bool False when WP Admin Bar support is disabled; true when enabled (default)
+ * @since 1.5
  * @uses apply_filters() Filter 'bp_use_wp_admin_bar' to alter
- * @return bool False when WP Admin Bar support is disabled (default); true when enabled
  */
 function bp_use_wp_admin_bar() {
-    return apply_filters( 'bp_use_wp_admin_bar', defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR );
+    $use_admin_bar = true;
+
+    // Has the WP Admin Bar constant been explicity set?
+    if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && ! BP_USE_WP_ADMIN_BAR )
+        $use_admin_bar = false;
+
+    // Has the admin chosen to use the BuddyBar during an upgrade?
+    elseif ( (bool) bp_get_option( 'bp-force-buddybar', false ) )
+        $use_admin_bar = false;
+
+    return apply_filters( 'bp_use_wp_admin_bar', $use_admin_bar );
 }
 

trunk/bp-loader.php

@@ -22 +22 @@
 // Define the database version
 if ( !defined( 'BP_DB_VERSION' ) )
-    define( 'BP_DB_VERSION', 3820 );
+    define( 'BP_DB_VERSION', 5222 );
 
 // Place your custom code (actions/filters) in a file called