<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17658] trunk/wp-includes/admin-bar.php:
Used passed admin bar object instead of global.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17658">17658</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-18 22:03:34 +0000 (Mon, 18 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Used passed admin bar object instead of global. Props solarissmoke. fixes <a href="http://trac.wordpress.org/ticket/16540">#16540</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (17657 => 17658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2011-04-18 21:53:15 UTC (rev 17657)
+++ trunk/wp-includes/admin-bar.php 2011-04-18 22:03:34 UTC (rev 17658)
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>-function wp_admin_bar_my_account_menu() {
- global $wp_admin_bar, $user_identity;
</del><ins>+function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
+ global $user_identity;
</ins><span class="cx">
</span><span class="cx"> $user_id = get_current_user_id();
</span><span class="cx">
</span><span class="lines">@@ -102,8 +102,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>-function wp_admin_bar_my_sites_menu() {
- global $wpdb, $wp_admin_bar;
</del><ins>+function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
+ global $wpdb;
</ins><span class="cx">
</span><span class="cx"> /* Add the 'My Sites' menu if the user has more than one site. */
</span><span class="cx"> if ( count( $wp_admin_bar->user->blogs ) <= 1 )
</span><span class="lines">@@ -137,9 +137,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>-function wp_admin_bar_shortlink_menu() {
- global $wp_admin_bar;
-
</del><ins>+function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
</ins><span class="cx"> $short = wp_get_shortlink( 0, 'query' );
</span><span class="cx"> $id = 'get-shortlink';
</span><span class="cx">
</span><span class="lines">@@ -161,9 +159,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>-function wp_admin_bar_edit_menu () {
- global $wp_admin_bar;
-
</del><ins>+function wp_admin_bar_edit_menu( $wp_admin_bar ) {
</ins><span class="cx"> $current_object = get_queried_object();
</span><span class="cx">
</span><span class="cx"> if ( empty($current_object) )
</span><span class="lines">@@ -181,9 +177,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>-function wp_admin_bar_new_content_menu() {
- global $wp_admin_bar;
-
</del><ins>+function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
</ins><span class="cx"> $actions = array();
</span><span class="cx"> foreach ( (array) get_post_types( array( 'show_ui' => true ), 'objects' ) as $ptype_obj ) {
</span><span class="cx"> if ( true !== $ptype_obj->show_in_menu || ! current_user_can( $ptype_obj->cap->edit_posts ) )
</span><span class="lines">@@ -207,9 +201,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>-function wp_admin_bar_comments_menu() {
- global $wp_admin_bar;
-
</del><ins>+function wp_admin_bar_comments_menu( $wp_admin_bar ) {
</ins><span class="cx"> if ( !current_user_can('edit_posts') )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -225,9 +217,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>-function wp_admin_bar_appearance_menu() {
- global $wp_admin_bar;
-
</del><ins>+function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
</ins><span class="cx"> if ( !current_user_can('switch_themes') )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -248,9 +238,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>-function wp_admin_bar_updates_menu() {
- global $wp_admin_bar;
-
</del><ins>+function wp_admin_bar_updates_menu( $wp_admin_bar ) {
</ins><span class="cx"> if ( !current_user_can('install_plugins') )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>