Changeset 6159 for trunk/bp-core/bp-core-admin.php

Timestamp:

06/30/2012 02:26:50 PM (13 years ago)

Author:

djpaul

Message:

Reinstate the 'Switch to Toolbar' option when you chose to stick with the BuddyBar during a 1.6 upgrade. Fixes #3661.
Also fixes a problem with extra whitespace in wp-admin when using the BuddyBar.

File:

• trunk/bp-core/bp-core-admin.php (modified) (1 diff)

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

@@ -287 +287 @@
         register_setting  ( 'buddypress',           'hide-loggedout-adminbar',        'intval'                                                                              );
 
-        // Allow favorites setting
+        // Only show 'switch to Toolbar' option if the user chose to retain the BuddyBar during the 1.6 upgrade
+        if ( (bool) bp_get_option( '_bp_force_buddybar', false ) ) {
+            add_settings_field( '_bp_force_buddybar', __( 'Toolbar', 'buddypress' ), 'bp_admin_setting_callback_force_buddybar', 'buddypress', 'bp_main' );
+            register_setting( 'buddypress', '_bp_force_buddybar', 'bp_admin_sanitize_callback_force_buddybar' );
+        }
+
+        // Allow account deletion
         add_settings_field( 'bp-disable-account-deletion', __( 'Account Deletion', 'buddypress' ), 'bp_admin_setting_callback_account_deletion', 'buddypress', 'bp_main' );
         register_setting  ( 'buddypress',           'bp-disable-account-deletion', 'intval'                                                                              );