Ticket #5223: 5223.patch

bp-core/bp-core-functions.php

@@ -532 +532 @@
         update_site_option( 'illegal_names', get_site_option( 'illegal_names' ), array() );
 }
 
+/**
+ * Determine whether BuddyPress should register the bp-themes directory.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @return bool True if bp-themes should be registered, false otherwise.
+ */
+function bp_do_register_theme_directory() {
+        $register = 'bp-default' === get_stylesheet() || 'bp-default' === get_template();
+        return apply_filters( 'bp_do_register_theme_directory', $register );
+}
+
 /** URI ***********************************************************************/
 
 /**

bp-loader.php

@@ -530 +530 @@
          * @todo Move bp-default to wordpress.org/extend/themes and remove this
          */
         public function register_theme_directory() {
+                if ( ! bp_do_register_theme_directory() ) {
+                        return;
+                }
+
                 register_theme_directory( $this->old_themes_dir );
         }