Skip to:
Content

BuddyPress.org

Changeset 801


Ignore:
Timestamp:
12/22/2008 08:16:53 PM (18 years ago)
Author:
apeatling
Message:

Made the BuddyPress admin bar persist in the wp-admin area.
Fixed the ordering of navigation items in the "My Account" menu.

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-activity.php

    r799 r801  
    163163}
    164164add_action( 'wp', 'bp_activity_setup_globals', 1 );
    165 add_action( '_admin_menu', 'bp_activity_setup_globals', 1 );
     165add_action( 'admin_menu', 'bp_activity_setup_globals', 1 );
    166166
    167167
    … …  
    195195}
    196196add_action( 'wp', 'bp_activity_setup_nav', 2 );
     197add_action( 'admin_menu', 'bp_activity_setup_nav', 2 );
    197198
    198199/***** Screens **********/

  • trunk/bp-blogs.php

    r754 r801  
    141141}
    142142add_action( 'wp', 'bp_blogs_setup_globals', 1 );   
    143 add_action( '_admin_menu', 'bp_blogs_setup_globals', 1 );
     143add_action( 'admin_menu', 'bp_blogs_setup_globals', 1 );
    144144
    145145
    … …  
    187187}
    188188add_action( 'wp', 'bp_blogs_setup_nav', 2 );
     189add_action( 'admin_menu', 'bp_blogs_setup_nav', 2 );
    189190
    190191function bp_blogs_screen_my_blogs() {

  • trunk/bp-core.php

    r754 r801  
    307307}
    308308add_action( 'wp', 'bp_core_setup_nav', 2 );
     309add_action( 'admin_menu', 'bp_core_setup_nav', 2 );
    309310
    310311/**

  • trunk/bp-core/bp-core-adminbar.php

    r704 r801  
    4242// **** "My Account" Menu ******
    4343function bp_adminbar_account_menu() {
     44    global $bp;
     45   
     46    /* Sort the nav by key as the array has been put together in different locations */
     47    $bp['bp_nav'] = bp_core_sort_nav_items( $bp['bp_nav'] );
     48   
    4449    if ( is_user_logged_in() ) {
    45         global $bp;
    4650       
    4751        echo '<li><a href="">';
    … …  
    264268
    265269add_action( 'wp_footer', 'bp_core_admin_bar' );
     270add_action( 'admin_footer', 'bp_core_admin_bar' );
    266271
    267272?>

  • trunk/bp-core/bp-core-cssjs.php

    r561 r801  
    1515}
    1616add_action( 'wp', 'bp_core_add_js' );
     17add_action( 'admin_menu', 'bp_core_add_js' );
    1718
    1819/**
    … …  
    8586
    8687/**
     88 * bp_core_add_admin_css()
     89 *
     90 * Add the CSS needed for all components in the admin area.
     91 *
     92 * @package BuddyPress Core
     93 * @uses get_option() Selects a site setting from the DB.
     94 */
     95function bp_core_add_admin_css() {
     96    wp_enqueue_style( 'bp-admin-bar', site_url('/wp-content/mu-plugins/bp-core/css/admin-bar.css') );
     97}
     98add_action( 'admin_menu', 'bp_core_add_admin_css' );
     99
     100/**
    87101 * bp_core_add_cropper_js()
    88102 *

  • trunk/bp-core/bp-core-settings.php

    r683 r801  
    1212}
    1313add_action( 'wp', 'bp_core_add_settings_nav', 2 );
     14add_action( 'admin_menu', 'bp_core_add_settings_nav', 2 );
    1415
    1516/**** GENERAL SETTINGS ****/

  • trunk/bp-friends.php

    r754 r801  
    6666}
    6767add_action( 'wp', 'friends_setup_globals', 1 );
    68 add_action( '_admin_menu', 'friends_setup_globals', 1 );
     68add_action( 'admin_menu', 'friends_setup_globals', 1 );
    6969
    7070function friends_check_installed() {   
    … …  
    109109}
    110110add_action( 'wp', 'friends_setup_nav', 2 );
     111add_action( 'admin_menu', 'friends_setup_nav', 2 );
    111112
    112113/***** Screens **********/

  • trunk/bp-groups.php

    r754 r801  
    136136}
    137137add_action( 'wp', 'groups_setup_globals', 1, false );   
    138 add_action( '_admin_menu', 'groups_setup_globals', 1, false );
     138add_action( 'admin_menu', 'groups_setup_globals', 1, false );
    139139
    140140
    … …  
    278278}
    279279add_action( 'wp', 'groups_setup_nav', 2 );
     280add_action( 'admin_menu', 'groups_setup_nav', 2 );
    280281
    281282

  • trunk/bp-messages.php

    r796 r801  
    111111}
    112112add_action( 'wp', 'messages_setup_globals', 1 );   
    113 add_action( '_admin_menu', 'messages_setup_globals', 1 );
     113add_action( 'admin_menu', 'messages_setup_globals', 1 );
    114114
    115115
    … …  
    167167}
    168168add_action( 'wp', 'messages_setup_nav', 2 );
     169add_action( 'admin_menu', 'messages_setup_nav', 2 );
    169170
    170171/***** Screens **********/

  • trunk/bp-wire.php

    r754 r801  
    4545}
    4646add_action( 'wp', 'bp_wire_setup_globals', 1 );
    47 add_action( '_admin_menu', 'bp_wire_setup_globals', 1 );
     47add_action( 'admin_menu', 'bp_wire_setup_globals', 1 );
    4848
    4949/**************************************************************************
    … …  
    7373}
    7474add_action( 'wp', 'bp_wire_setup_nav', 2 );
     75add_action( 'admin_menu', 'bp_wire_setup_nav', 2 );
    7576
    7677/***** Screens **********/

  • trunk/bp-xprofile.php

    r754 r801  
    184184}
    185185add_action( 'wp', 'xprofile_setup_globals', 1 );   
    186 add_action( '_admin_menu', 'xprofile_setup_globals', 1 );
     186add_action( 'admin_menu', 'xprofile_setup_globals', 1 );
    187187
    188188/**
    … …  
    255255}
    256256add_action( 'wp', 'xprofile_setup_nav', 2 );
     257add_action( 'admin_menu', 'xprofile_setup_nav', 2 );
    257258
    258259/********
Note: See TracChangeset for help on using the changeset viewer.