Changeset 6159

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.

Location:

trunk/bp-core

Files:

• admin/bp-core-settings.php (modified) (2 diffs)
• bp-core-admin.php (modified) (1 diff)
• css/buddybar.dev.css (modified) (1 diff)

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

@@ -50 +50 @@
 }
 
+/**
+ * If user has upgraded to 1.6 and chose to retain their BuddyBar, offer then a switch to change over
+ * to the WP Toolbar.
+ *
+ * @since BuddyPress (1.6)
+ */
+function bp_admin_setting_callback_force_buddybar() {
+?>
+
+    <input id="_bp_force_buddybar" name="_bp_force_buddybar" type="checkbox" value="1" <?php checked( ! bp_force_buddybar( true ) ); ?> />
+    <label for="_bp_force_buddybar"><?php _e( 'Switch to WordPress Toolbar', 'buddypress' ); ?></label>
+
+<?php
+}
+
 /** Activity *******************************************************************/
 
@@ -87 +102 @@
 
 <?php
+}
+
+/**
+ * Sanitization for _bp_force_buddyvar
+ *
+ * If upgraded to 1.6 and you chose to keep the BuddyBar, a checkbox asks if you want to switch to
+ * the WP Toolbar. The option we store is 1 if the BuddyBar is forced on, so we use this function
+ * to flip the boolean before saving the intval.
+ *
+ * @since BuddyPress (1.6)
+ * @access Private
+ */
+function bp_admin_sanitize_callback_force_buddybar( $value = false ) {
+    return $value ? 0 : 1;
 }
 

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'                                                                              );

trunk/bp-core/css/buddybar.dev.css

@@ -1 @@
-body,
-body.wp-admin {
+body:not(.wp-admin) {
     padding-top: 25px !important;
 }