Changeset 7904

Timestamp:

02/17/2014 12:42:05 AM (10 years ago)

Author:

boonebgorges

Message:

Install default options at installation time and at upgrade to 2.0

When BuddyPress is installed, all basic config options should be saved to the
database, even when the setting is empty (0). This ensures that the options
will be pre-fetched by the first call to wp_load_alloptions() and stored in the
non-persistent cache, removing the necessity to make additional failed queries
to the wp_options table.

This changeset also includes logic to add missing default options to existing
default installations when upgrading to 2.0.

Fixes #5385

Location:

trunk

Files:

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

trunk/bp-core/bp-core-options.php

@@ -80 +80 @@
 
         // Force the BuddyBar
-        '_bp_force_buddybar'              => false
+        '_bp_force_buddybar'              => false,
+
+        /** Legacy theme *********************************************/
+
+        // Whether to register the bp-default themes directory
+        '_bp_retain_bp_default'           => false,
+
+        /** Widgets **************************************************/
+        'widget_bp_core_login_widget'                => false,
+        'widget_bp_core_members_widget'              => false,
+        'widget_bp_core_whos_online_widget'          => false,
+        'widget_bp_core_recently_active_widget'      => false,
+        'widget_bp_groups_widget'                    => false,
+        'widget_bp_messages_sitewide_notices_widget' => false,
     );
 
@@ -89 +102 @@
  * Add default options when BuddyPress is first activated.
  *
- * Hooked to bp_activate, it is only called once when BuddyPress is activated.
- * This is non-destructive, so existing settings will not be overridden.
- *
- * Currently unused.
+ * Only called once when BuddyPress is activated.
+ * Non-destructive, so existing settings will not be overridden.
  *
  * @since BuddyPress (1.6.0)
@@ -106 +117 @@
 
     // Add default options
-    foreach ( $options as $key => $value )
-        add_option( $key, $value );
+    foreach ( $options as $key => $value ) {
+        bp_add_option( $key, $value );
+    }
 
     // Allow previously activated plugins to append their own options.

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

@@ -233 +233 @@
 
         // 2.0
-        if ( $raw_db_version < 7859 ) {
+        if ( $raw_db_version < 7892 ) {
             bp_update_to_2_0();
         }
@@ -338 +338 @@
  * - Ensure that the activity tables are installed, for last_activity storage.
  * - Migrate last_activity data from usermeta to activity table
+ * - Add values for all BuddyPress options to the options table
  */
 function bp_update_to_2_0() {
     global $wpdb;
 
-    // Install activity tables
+    /** Install activity tables for 'last_activity' **********************/
     bp_core_install_activity_streams();
 
     $bp = buddypress();
 
-    // Migrate data
+    /** Migrate 'last_activity' data *************************************/
+
     // The "NOT IN" clause prevents duplicates
     $sql = "INSERT INTO {$bp->members->table_name_last_activity} (`user_id`, `component`, `type`, `date_recorded` ) (
@@ -363 +365 @@
 
     $wpdb->query( $sql );
+
+    /** Add BP options to the options table ******************************/
+    bp_add_options();
 }
 
@@ -405 +410 @@
     // Force refresh theme roots.
     delete_site_transient( 'theme_roots' );
+
+    // Add options
+    bp_add_options();
 
     // Use as of (1.6)

trunk/bp-loader.php

@@ -305 +305 @@
 
         $this->version    = '2.0-alpha-7752';
-        $this->db_version = 7859;
+        $this->db_version = 7892;
 
         /** Loading ***************************************************/