<!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" />
<title>[18919] trunk/wp-includes: Clean up the 'Site Name' admin bar functions.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18919">18919</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2011-10-07 19:52:26 +0000 (Fri, 07 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up the 'Site Name' admin bar functions.</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 (18918 => 18919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2011-10-07 19:12:55 UTC (rev 18918)
+++ trunk/wp-includes/admin-bar.php 2011-10-07 19:52:26 UTC (rev 18919)
</span><span class="lines">@@ -219,11 +219,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Add the "Blog Name" menu in the front end.
</del><ins>+ * Add the "Site Name" menu.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> */
</span><del>-function wp_admin_bar_blog_front_menu( $wp_admin_bar ) {
</del><ins>+function wp_admin_bar_site_menu( $wp_admin_bar ) {
+ global $current_site;
+
</ins><span class="cx"> if ( ! is_user_logged_in() )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -232,65 +234,46 @@
</span><span class="cx"> if ( empty( $blogname ) )
</span><span class="cx"> $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
</span><span class="cx">
</span><ins>+ if ( is_network_admin() ) {
+ $blogname = sprintf( __('Network Admin: %s'), esc_html( $current_site->site_name ) );
+ } elseif ( is_user_admin() ) {
+ $blogname = sprintf( __('Global Dashboard: %s'), esc_html( $current_site->site_name ) );
+ }
+
</ins><span class="cx"> $title = wp_html_excerpt( $blogname, 40 );
</span><span class="cx"> if ( $title != $blogname )
</span><span class="cx"> $title = trim( $title ) . '&hellip;';
</span><span class="cx">
</span><span class="cx"> $wp_admin_bar->add_menu( array(
</span><del>- 'id' => 'blog-name',
</del><ins>+ 'id' => 'site-name',
</ins><span class="cx"> 'title' => $title,
</span><del>- 'href' => admin_url(),
</del><ins>+ 'href' => is_admin() ? home_url() : admin_url(),
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Add Dashboard item.
- $wp_admin_bar->add_menu( array(
- 'id' => 'dashboard',
- 'title' => __( 'Dashboard' ),
- 'href' => admin_url(),
- 'parent' => 'blog-name',
- ) );
</del><ins>+ // Create submenu items.
</ins><span class="cx">
</span><del>- wp_admin_bar_appearance_menu( $wp_admin_bar );
-}
</del><ins>+ if ( is_admin() ) {
+ // Add an option to visit the site.
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'site-name',
+ 'id' => 'view-site',
+ 'title' => __( 'Visit Site' ),
+ 'href' => home_url(),
+ ) );
</ins><span class="cx">
</span><del>-/**
- * Add the "Blog Name" menu in the admin.
- *
- * @since 3.3.0
- */
-function wp_admin_bar_blog_admin_menu( $wp_admin_bar ) {
- global $current_site;
-
- if ( is_network_admin() ) {
- $title = sprintf( __('Network Admin: %s'), esc_html($current_site->site_name) );
- $url = '#';
- } elseif ( is_user_admin() ) {
- $title = sprintf( __('Global Dashboard: %s'), esc_html($current_site->site_name) );
- $url = '#';
</del><ins>+ // We're on the front end, print a copy of the admin menu.
</ins><span class="cx"> } else {
</span><del>- $title = get_bloginfo('name');
- $url = get_home_url();
</del><ins>+ // Add the dashboard item.
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'site-name',
+ 'id' => 'dashboard',
+ 'title' => __( 'Dashboard' ),
+ 'href' => admin_url(),
+ ) );
</ins><span class="cx">
</span><del>- if ( empty( $title ) )
- $title = preg_replace( '#^(https?://)?(www.)?#', '', $url );
</del><ins>+ // Add the appearance menu.
+ wp_admin_bar_appearance_menu( $wp_admin_bar );
</ins><span class="cx"> }
</span><del>-
- $title_excerpt = wp_html_excerpt( $title, 40 );
- if ( $title != $title_excerpt )
- $title_excerpt = trim( $title_excerpt ) . '&hellip;';
-
- $wp_admin_bar->add_menu( array(
- 'id' => 'blog-name',
- 'title' => $title_excerpt,
- 'href' => $url,
- ) );
-
- $wp_admin_bar->add_menu( array(
- 'parent' => 'blog-name',
- 'id' => 'view-site',
- 'title' => __( 'Visit Site' ),
- 'href' => home_url(),
- ) );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -586,7 +569,7 @@
</span><span class="cx"> 'id' => 'appearance',
</span><span class="cx"> 'title' => __('Appearance'),
</span><span class="cx"> 'href' => admin_url('themes.php'),
</span><del>- 'parent' => 'blog-name',
</del><ins>+ 'parent' => 'site-name',
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can( 'edit_theme_options' ) )
</span></span></pre></div>
<a id="trunkwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-admin-bar.php (18918 => 18919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-admin-bar.php 2011-10-07 19:12:55 UTC (rev 18918)
+++ trunk/wp-includes/class-wp-admin-bar.php 2011-10-07 19:52:26 UTC (rev 18919)
</span><span class="lines">@@ -179,6 +179,7 @@
</span><span class="cx"> // Site related.
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
</span><ins>+ add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
</ins><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 40 );
</span><span class="cx">
</span><span class="cx"> // Content related.
</span><span class="lines">@@ -188,10 +189,8 @@
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 );
</span><span class="cx">
</span><span class="cx"> if ( ! is_admin() ) {
</span><del>- add_action( 'admin_bar_menu', 'wp_admin_bar_blog_front_menu', 30 );
</del><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 100 );
</span><span class="cx"> } else {
</span><del>- add_action( 'admin_bar_menu', 'wp_admin_bar_blog_admin_menu', 30 );
</del><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_help_menu', 90 );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>