Skip to:
Content

BuddyPress.org

Changeset 6822


Ignore:
Timestamp:
02/25/2013 12:57:06 AM (11 years ago)
Author:
boonebgorges
Message:

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

Fixes #4846

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-core/bp-core-actions.php

    r6800 r6822  
    3737add_action( 'set_current_user',        'bp_setup_current_user',     10    );
    3838add_action( 'setup_theme',             'bp_setup_theme',            10    );
    39 add_action( 'after_setup_theme',       'bp_after_setup_theme',      10    );
     39add_action( 'after_setup_theme',       'bp_after_setup_theme',      100   ); // After WP themes
    4040add_action( 'wp_enqueue_scripts',      'bp_enqueue_scripts',        10    );
    4141add_action( 'admin_bar_menu',          'bp_setup_admin_bar',        20    ); // After WP core
  • trunk/bp-core/bp-core-dependency.php

    r6767 r6822  
    197197 * been setup and the theme's functions.php has loaded.
    198198 *
     199 * Hooked to 'after_setup_theme' with a priority of 100. This allows plenty of
     200 * time for other themes to load their features, such as BuddyPress support,
     201 * before our theme compatibility layer kicks in.
     202 *
    199203 * @since BuddyPress (1.6)
    200204 *
  • trunk/bp-templates/bp-legacy/buddypress-functions.php

    r6805 r6822  
    4848
    4949        // Bail if theme is a derivative of bp-default
    50         if ( in_array( 'bp-default', array( get_template(), get_stylesheet() ) ) )
     50        if ( in_array( 'bp-default', array( get_template(), get_stylesheet() ) ) ) {
    5151            return;
     52        }
     53
     54        // Or if the theme supports 'buddypress'
     55        if ( current_theme_supports( 'buddypress' ) ) {
     56            return;
     57        }
    5258
    5359        $this->setup_globals();
Note: See TracChangeset for help on using the changeset viewer.