Ticket #4846: 4846.patch

bp-core/bp-core-actions.php

@@ -36 +36 @@
 add_action( 'wp',                      'bp_ready',                  10    );
 add_action( 'set_current_user',        'bp_setup_current_user',     10    );
 add_action( 'setup_theme',             'bp_setup_theme',            10    );
-add_action( 'after_setup_theme',       'bp_after_setup_theme',      10    );
+add_action( 'after_setup_theme',       'bp_after_setup_theme',      100   ); // After WP themes
 add_action( 'wp_enqueue_scripts',      'bp_enqueue_scripts',        10    );
 add_action( 'admin_bar_menu',          'bp_setup_admin_bar',        20    ); // After WP core
 add_action( 'template_redirect',       'bp_template_redirect',      10    );

bp-core/bp-core-dependency.php

@@ -196 +196 @@
  * Piggy back action for BuddyPress sepecific theme actions once the theme has
  * been setup and the theme's functions.php has loaded.
  *
+ * Hooked to 'after_setup_theme' with a priority of 100. This allows plenty of
+ * time for other themes to load their features, such as BuddyPress support,
+ * before our theme compatibility layer kicks in.
+ *
  * @since BuddyPress (1.6)
  *
  * @uses do_action() Calls 'bp_after_setup_theme'

bp-templates/bp-legacy/buddypress-functions.php

@@ -47 +47 @@
         public function __construct() {
 
                 // Bail if theme is a derivative of bp-default
-                if ( in_array( 'bp-default', array( get_template(), get_stylesheet() ) ) )
+                if ( in_array( 'bp-default', array( get_template(), get_stylesheet() ) ) ) {
                         return;
+                }
+
+                // Or if the theme supports 'buddypress'
+                if ( current_theme_supports( 'buddypress' ) ) {
+                        return;
+                }
 
                 $this->setup_globals();
                 $this->setup_actions();