Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 22:35:02 +02:00
Code Issues Projects Releases Wiki Activity

Used passed admin bar object instead of global. Props solarissmoke. fixes #16540

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17658 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-04-18 22:03:34 +00:00
parent 976fbf8505
commit 2317e890c2
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-includes/admin-bar.php
View File

@ -75,8 +75,8 @@ add_action( 'admin_footer', 'wp_admin_bar_render', 1000 );
* *
* @since 3.1.0 * @since 3.1.0
*/ */
function wp_admin_bar_my_account_menu() { function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
global $wp_admin_bar, $user_identity; global $user_identity;
$user_id = get_current_user_id(); $user_id = get_current_user_id();
@ -102,8 +102,8 @@ function wp_admin_bar_my_account_menu() {
* *
* @since 3.1.0 * @since 3.1.0
*/ */
function wp_admin_bar_my_sites_menu() { function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
global $wpdb, $wp_admin_bar; global $wpdb;
/* Add the 'My Sites' menu if the user has more than one site. */ /* Add the 'My Sites' menu if the user has more than one site. */
if ( count( $wp_admin_bar->user->blogs ) <= 1 ) if ( count( $wp_admin_bar->user->blogs ) <= 1 )
@ -137,9 +137,7 @@ function wp_admin_bar_my_sites_menu() {
* *
* @since 3.1.0 * @since 3.1.0
*/ */
function wp_admin_bar_shortlink_menu() { function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
global $wp_admin_bar;
$short = wp_get_shortlink( 0, 'query' ); $short = wp_get_shortlink( 0, 'query' );
$id = 'get-shortlink'; $id = 'get-shortlink';
@ -161,9 +159,7 @@ function wp_admin_bar_shortlink_menu() {
* *
* @since 3.1.0 * @since 3.1.0
*/ */
function wp_admin_bar_edit_menu () { function wp_admin_bar_edit_menu( $wp_admin_bar ) {
global $wp_admin_bar;
$current_object = get_queried_object(); $current_object = get_queried_object();
if ( empty($current_object) ) if ( empty($current_object) )
@ -181,9 +177,7 @@ function wp_admin_bar_edit_menu () {
* *
* @since 3.1.0 * @since 3.1.0
*/ */
function wp_admin_bar_new_content_menu() { function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
global $wp_admin_bar;
$actions = array(); $actions = array();
foreach ( (array) get_post_types( array( 'show_ui' => true ), 'objects' ) as $ptype_obj ) { foreach ( (array) get_post_types( array( 'show_ui' => true ), 'objects' ) as $ptype_obj ) {
if ( true !== $ptype_obj->show_in_menu || ! current_user_can( $ptype_obj->cap->edit_posts ) ) if ( true !== $ptype_obj->show_in_menu || ! current_user_can( $ptype_obj->cap->edit_posts ) )
@ -207,9 +201,7 @@ function wp_admin_bar_new_content_menu() {
* *
* @since 3.1.0 * @since 3.1.0
*/ */
function wp_admin_bar_comments_menu() { function wp_admin_bar_comments_menu( $wp_admin_bar ) {
global $wp_admin_bar;
if ( !current_user_can('edit_posts') ) if ( !current_user_can('edit_posts') )
return; return;
@ -225,9 +217,7 @@ function wp_admin_bar_comments_menu() {
* *
* @since 3.1.0 * @since 3.1.0
*/ */
function wp_admin_bar_appearance_menu() { function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
global $wp_admin_bar;
if ( !current_user_can('switch_themes') ) if ( !current_user_can('switch_themes') )
return; return;
@ -248,9 +238,7 @@ function wp_admin_bar_appearance_menu() {
* *
* @since 3.1.0 * @since 3.1.0
*/ */
function wp_admin_bar_updates_menu() { function wp_admin_bar_updates_menu( $wp_admin_bar ) {
global $wp_admin_bar;
if ( !current_user_can('install_plugins') ) if ( !current_user_can('install_plugins') )
return; return;