Changeset 6822

Timestamp:

02/25/2013 12:57:06 AM (12 years ago)

Author:

boonebgorges

Message:

Don't load bp-legacy theme compat if current_theme_supports( 'buddypress' )

Fixes #4846

Location:

trunk

Files:

• bp-core/bp-core-actions.php (modified) (1 diff)
• bp-core/bp-core-dependency.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)

trunk/bp-core/bp-core-actions.php

@@ -37 +37 @@
 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

trunk/bp-core/bp-core-dependency.php

@@ -197 +197 @@
  * 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)
  *

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

@@ -48 +48 @@
 
         // 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();