Changeset 6067

Timestamp:

06/08/2012 09:52:38 PM (14 years ago)

Author:

djpaul

Message:

Correct BuddyPress core settings values when upgrading from 1.5 to 1.6. Fixes #4008

Location:

trunk

Files:

• bp-core/admin/bp-core-settings.php (modified) (1 diff)
• bp-core/admin/bp-core-update.php (modified) (1 diff)
• bp-core/bp-core-admin.php (modified) (3 diffs)
• bp-loader.php (modified) (1 diff)

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

@@ -209 +209 @@
         // Some legacy options are not registered with the Settings API
         $legacy_options = array(
+            'bp-disable-account-deletion',
+            'bp-disable-avatar-uploads',
             'bp-disable-profile-sync',
+            'bp_restrict_group_creation',
             'hide-loggedout-adminbar',
-            'bp-disable-avatar-uploads',
-            'bp-disable-account-deletion',
-            'bp_restrict_group_creation'
         );
 

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

@@ -1038 +1038 @@
         delete_site_option( bp_get_root_blog_id(), '_bp-core-db-version' );
         delete_site_option( bp_get_root_blog_id(), '_bp_db_version'      );
+
+        // Some legacy options need to be flipped from 1 to 0s
+        $legacy_options = array(
+            'bp-disable-account-deletion',
+            'bp-disable-avatar-uploads',
+            'bp-disable-profile-sync',
+            'bp_restrict_group_creation',
+            'hide-loggedout-adminbar',
+        );
+
+        /**
+         * Note: Each of these options is represented by its opposite in the UI
+         * Ie, the Profile Syncing option reads "Enable Sync", so when it's checked,
+         * the corresponding option should be unset.
+         */
+        foreach( $legacy_options as $legacy_option ) {
+            $value = bp_get_option( $legacy_option );
+            if ( empty( $value ) )
+                $value = 1;
+            else
+                $value = 0;
+
+            bp_update_option( $legacy_option, $value );
+        }
     }
 

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

@@ -283 +283 @@
         add_settings_section( 'bp_main',            __( 'Main Settings',    'buddypress' ), 'bp_admin_setting_callback_main_section',     'buddypress'            );
 
-        // Throttle setting
-        add_settings_field( '_bp_admin_bar',        __( 'Toolbar',        'buddypress' ), 'bp_admin_setting_callback_admin_bar',        'buddypress', 'bp_main' );
-        register_setting  ( 'buddypress',           '_bp_admin_bar',        'intval'                                                                              );
+        // Hide toolbar for logged out users setting
+        add_settings_field( 'hide-loggedout-adminbar',        __( 'Toolbar',        'buddypress' ), 'bp_admin_setting_callback_admin_bar',        'buddypress', 'bp_main' );
+        register_setting  ( 'buddypress',           'hide-loggedout-adminbar',        'intval'                                                                              );
 
         // Allow favorites setting
-        add_settings_field( '_bp_account_deletion', __( 'Account Deletion', 'buddypress' ), 'bp_admin_setting_callback_account_deletion', 'buddypress', 'bp_main' );
-        register_setting  ( 'buddypress',           '_bp_account_deletion', 'intval'                                                                              );
+        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'                                                                              );
 
         /** XProfile Section **************************************************/
@@ -299 +299 @@
 
             // Allow topic and reply revisions
-            add_settings_field( '_bp_avatar_uploads', __( 'Avatar Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', 'bp_xprofile' );
-            register_setting  ( 'buddypress',         '_bp_avatar_uploads',   'intval'                                                                                  );
+            add_settings_field( 'bp-disable-avatar-uploads', __( 'Avatar Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', 'bp_xprofile' );
+            register_setting  ( 'buddypress',         'bp-disable-avatar-uploads',   'intval'                                                                                  );
 
             // Profile sync setting
-            add_settings_field( '_bp_profile_sync',   __( 'Profile Syncing',  'buddypress' ), 'bp_admin_setting_callback_profile_sync',     'buddypress', 'bp_xprofile' );
-            register_setting  ( 'buddypress',         '_bp_profile_sync',     'intval'                                                                                  );
+            add_settings_field( 'bp-disable-profile-sync',   __( 'Profile Syncing',  'buddypress' ), 'bp_admin_setting_callback_profile_sync',     'buddypress', 'bp_xprofile' );
+            register_setting  ( 'buddypress',         'bp-disable-profile-sync',     'intval'                                                                                  );
         }
 
@@ -315 +315 @@
 
             // Allow subscriptions setting
-            add_settings_field( '_bp_group_creation', __( 'Group Creation',   'buddypress' ), 'bp_admin_setting_callback_group_creation',   'buddypress', 'bp_groups' );
-            register_setting  ( 'buddypress',         '_bp_group_creation',   'intval'                                                                                );
+            add_settings_field( 'bp_restrict_group_creation', __( 'Group Creation',   'buddypress' ), 'bp_admin_setting_callback_group_creation',   'buddypress', 'bp_groups' );
+            register_setting  ( 'buddypress',         'bp_restrict_group_creation',   'intval'                                                                                );
         }
 

trunk/bp-loader.php

@@ -58 +58 @@
      * @var int Database version of current BuddyPress files
      */
-    public $db_version = 5251;
+    public $db_version = 6066;
     
     /**