<!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>[17269] trunk/wp-includes: Admin Bar - show fullsite name in the tooltip.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17269">17269</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2011-01-12 16:02:56 +0000 (Wed, 12 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Admin Bar - show fullsite name in the tooltip. Correct some escaping. Fixes <a href="http://trac.wordpress.org/ticket/16197">#16197</a> props nacin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesclasswpadminbarphp">trunk/wp-includes/class-wp-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 (17268 => 17269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2011-01-12 08:05:23 UTC (rev 17268)
+++ trunk/wp-includes/admin-bar.php 2011-01-12 16:02:56 UTC (rev 17269)
</span><span class="lines">@@ -114,11 +114,13 @@
</span><span class="cx"> //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $default ) ) . '" alt="Blavatar" width="16" height="16" />';
</span><span class="cx"> $blavatar = '<img src="' . esc_url($default) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" class="blavatar"/>';
</span><span class="cx">
</span><del>- $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
</del><ins>+ $full_blogname = $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
</ins><span class="cx"> if ( strlen( $blogname ) > 15 )
</span><span class="cx"> $blogname = substr( $blogname, 0, 15 ) . '&hellip;';
</span><ins>+ else
+ $full_blogname = '';
</ins><span class="cx">
</span><del>- $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => get_admin_url($blog->userblog_id), ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => get_admin_url($blog->userblog_id), 'meta' => array( 'title' => $full_blogname ) ) );
</ins><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => get_admin_url($blog->userblog_id) ) );
</span><span class="cx">
</span><span class="cx"> if ( current_user_can_for_blog( $blog->userblog_id, 'edit_posts' ) ) {
</span></span></pre></div>
<a id="trunkwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-admin-bar.php (17268 => 17269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-admin-bar.php 2011-01-12 08:05:23 UTC (rev 17268)
+++ trunk/wp-includes/class-wp-admin-bar.php 2011-01-12 16:02:56 UTC (rev 17269)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> 'href' => false,
</span><span class="cx"> 'parent' => false, // false for a root menu, pass the ID value for a submenu of that menu.
</span><span class="cx"> 'id' => false, // defaults to a sanitized title value.
</span><del>- 'meta' => false // array of any of the following options: array( 'html' => '', 'class' => '', 'onclick' => '', target => '' );
</del><ins>+ 'meta' => false // array of any of the following options: array( 'html' => '', 'class' => '', 'onclick' => '', target => '', title => '' );
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -117,16 +117,19 @@
</span><span class="cx">
</span><span class="cx"> <li class="<?php echo $menuclass . "ab-$id" ?><?php
</span><span class="cx"> if ( ! empty( $menu_item['meta']['class'] ) ) :
</span><del>- echo ' ' . $menu_item['meta']['class'];
</del><ins>+ echo ' ' . esc_attr( $menu_item['meta']['class'] );
</ins><span class="cx"> endif;
</span><span class="cx"> ?>">
</span><del>- <a href="<?php echo strip_tags( $menu_item['href'] ) ?>"<?php
</del><ins>+ <a href="<?php echo esc_url( $menu_item['href'] ) ?>"<?php
</ins><span class="cx"> if ( ! empty( $menu_item['meta']['onclick'] ) ) :
</span><del>- ?> onclick="<?php echo $menu_item['meta']['onclick']; ?>"<?php
</del><ins>+ ?> onclick="<?php echo esc_js( $menu_item['meta']['onclick'] ); ?>"<?php
</ins><span class="cx"> endif;
</span><span class="cx"> if ( ! empty( $menu_item['meta']['target'] ) ) :
</span><del>- ?> target="<?php echo $menu_item['meta']['target']; ?>"<?php
</del><ins>+ ?> target="<?php echo esc_attr( $menu_item['meta']['target'] ); ?>"<?php
</ins><span class="cx"> endif;
</span><ins>+ if ( ! empty( $menu_item['meta']['title'] ) ) :
+ ?> title="<?php echo esc_attr( $menu_item['meta']['title'] ); ?>"<?php
+ endif;
</ins><span class="cx">
</span><span class="cx"> ?>><?php
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>