Ticket #5385: 5385.patch

bp-core/bp-core-options.php

@@ -79 +79 @@
                 /** BuddyBar **********************************************************/
 
                 // 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,
         );
 
         return apply_filters( 'bp_get_default_options', $options );
@@ -88 +99 @@
 /**
  * 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)
  *

bp-core/bp-core-update.php

@@ -230 +230 @@
                 if ( $raw_db_version < 7731 ) {
                         bp_update_to_1_9_2();
                 }
+
+                if ( $raw_db_version < 7820 ) {
+                        bp_update_to_2_0();
+                }
         }
 
         /** All done! *************************************************************/
@@ -328 +332 @@
 }
 
 /**
+ * Perform database updates for BP 2.0.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_update_to_2_0() {
+        bp_add_options();
+}
+
+/**
  * Redirect user to BP's What's New page on first page load after activation.
  *
  * @since BuddyPress (1.7.0)
@@ -368 +381 @@
         // Force refresh theme roots.
         delete_site_transient( 'theme_roots' );
 
+        // Add options
+        bp_add_options();
+
         // Use as of (1.6)
         do_action( 'bp_activation' );
 

bp-loader.php

@@ -304 +304 @@
                 /** Versions **************************************************/
 
                 $this->version    = '2.0-alpha-7752';
-                $this->db_version = 7731;
+                $this->db_version = 7820;
 
                 /** Loading ***************************************************/