Changeset 4631
- Timestamp:
- 07/09/2011 07:24:36 PM (14 years ago)
- Location:
- trunk/bp-core
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-core/bp-core-adminbar.php
r4602 r4631 10 10 */ 11 11 12 if ( ! defined( 'BP_USE_WP_ADMIN_BAR') || defined( 'DOING_AJAX' ) )12 if ( !bp_use_wp_admin_bar() || defined( 'DOING_AJAX' ) ) 13 13 return; 14 14 -
trunk/bp-core/bp-core-buddybar.php
r4602 r4631 510 510 511 511 // Show the WordPress admin bar 512 if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR&& $wp_version >= 3.1 ) {512 if ( bp_use_wp_admin_bar() && $wp_version >= 3.1 ) { 513 513 show_admin_bar( true ); 514 514 515 515 // Hide the WordPress admin bar 516 } elseif ( ! defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR) {516 } elseif ( !bp_use_wp_admin_bar() ) { 517 517 518 518 // Keep the WP admin bar from loading -
trunk/bp-core/bp-core-component.php
r4567 r4631 251 251 return; 252 252 253 // Do not proceed if constant is not set or is false254 if ( ! defined( 'BP_USE_WP_ADMIN_BAR' ) || !BP_USE_WP_ADMIN_BAR)253 // Do not proceed if BP_USE_WP_ADMIN_BAR constant is not set or is false 254 if ( !bp_use_wp_admin_bar() ) 255 255 return; 256 256 -
trunk/bp-core/bp-core-functions.php
r4630 r4631 1235 1235 } 1236 1236 1237 /** 1238 * Should we use the WP admin bar? 1239 * 1240 * The WP Admin Bar, introduced in WP 3.1, is fully supported in BuddyPress as of BP 1.3. 1241 * 1242 * For the BP 1.3 development cycle, the BuddyBar will remain the default navigation for BP 1243 * installations. In the future, this behavior will be changed, so that the WP Admin Bar is the 1244 * default. 1245 * 1246 * @package BuddyPress 1247 * @since 1.3 1248 * 1249 * @uses apply_filters() Filter 'bp_use_wp_admin_bar' to alter 1250 * @return bool False when WP Admin Bar support is disabled (default); true when enabled 1251 */ 1252 function bp_use_wp_admin_bar() { 1253 return apply_filters( 'bp_use_wp_admin_bar', defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR ); 1254 } 1255 1237 1256 /** Global Manipulators *******************************************************/ 1238 1257 -
trunk/bp-core/bp-core-hooks.php
r4567 r4631 64 64 */ 65 65 function bp_setup_admin_bar() { 66 if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR)66 if ( bp_use_wp_admin_bar() ) 67 67 do_action( 'bp_setup_admin_bar' ); 68 68 }
Note: See TracChangeset
for help on using the changeset viewer.