Ticket #5325: 5325.patch

bp-core/bp-core-functions.php

@@ -597 +597 @@
  */
 function bp_do_register_theme_directory() {
         $register = 'bp-default' === get_stylesheet() || 'bp-default' === get_template();
+
+        // Legacy sites continue to have the theme registered
+        if ( ! $register && 1 == get_site_option( '_bp_retain_bp_default' ) ) {
+                $register = true;
+        }
+
         return apply_filters( 'bp_do_register_theme_directory', $register );
 }
 

bp-core/bp-core-update.php

@@ -225 +225 @@
                 if ( $raw_db_version < 7553 ) {
                         bp_update_to_1_9();
                 }
+
+                // 1.9.2
+                if ( $raw_db_version < 7731 ) {
+                        bp_update_to_1_9_2();
+                }
         }
 
         /** All done! *************************************************************/
@@ -301 +306 @@
 }
 
 /**
+ * Perform database updates for BP 1.9.2
+ *
+ * In 1.9, BuddyPress stopped registering its theme directory when it detected
+ * that bp-default (or a child theme) was not currently being used, in effect
+ * deprecating bp-default. However, this ended up causing problems when site
+ * admins using bp-default would switch away from the theme temporarily:
+ * bp-default would no longer be available, with no obvious way (outside of
+ * a manual filter) to restore it. In 1.9.2, we add an option that flags
+ * whether bp-default or a child theme is active at the time of upgrade; if so,
+ * the theme directory will continue to be registered even if the theme is
+ * deactivated temporarily. Thus, new installations will not see bp-default,
+ * but legacy installations using the theme will continue to see it.
+ *
+ * @since BuddyPress (1.9.2)
+ */
+function bp_update_to_1_9_2() {
+        if ( 'bp-default' === get_stylesheet() || 'bp-default' === get_template() ) {
+                update_site_option( '_bp_retain_bp_default', 1 );
+        }
+}
+
+/**
  * Redirect user to BP's What's New page on first page load after activation.
  *
  * @since BuddyPress (1.7.0)

bp-loader.php

@@ -298 +298 @@
                 /** Versions **********************************************************/
 
                 $this->version    = '1.9-7682';
-                $this->db_version = 7553;
+                $this->db_version = 7731;
 
                 /** Loading ***********************************************************/