<!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>[15769] trunk/wp-includes: s/blog/site/ on the admin bar code.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15769">15769</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-09 12:22:00 +0000 (Sat, 09 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>s/blog/site/ on the admin bar code. props markmcwilliams, see <a href="http://trac.wordpress.org/ticket/14772">#14772</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesadminbaradminbarsuperadminphp">trunk/wp-includes/admin-bar/admin-bar-superadmin.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesadminbaradminbarsuperadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar/admin-bar-superadmin.php (15768 => 15769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar/admin-bar-superadmin.php 2010-10-09 12:18:52 UTC (rev 15768)
+++ trunk/wp-includes/admin-bar/admin-bar-superadmin.php 2010-10-09 12:22:00 UTC (rev 15769)
</span><span class="lines">@@ -29,17 +29,17 @@
</span><span class="cx">
</span><span class="cx"> wp_admin_bar_build_snackmenu();
</span><span class="cx">
</span><del>- /* Get the settings we need for the current blog */
</del><ins>+ /* Get the settings we need for the current site */
</ins><span class="cx"> $matureaction = $current_blog->mature ? 'unmatureblog' : 'matureblog';
</span><span class="cx"> $maturetext = $current_blog->mature ? esc_attr__('Unmark as mature') : esc_attr__('Mark as mature');
</span><del>- $suspendtext = $current_blog->spam ? esc_attr('Unsuspend blog') : esc_attr('Suspend blog');
</del><ins>+ $suspendtext = $current_blog->spam ? esc_attr('Unsuspend site') : esc_attr('Suspend site');
</ins><span class="cx"> $suspendaction = $current_blog->spam ? 'unspamblog' : 'spamblog';
</span><del>- $mature_url = admin_url( "ms-edit.php?action=confirm&amp;action2={$matureaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( 'Are you sure you want to ' . strtolower( $maturetext ) . " {$current_blog->domain} as mature?" ) );
- $suspend_url = admin_url( "ms-edit.php?action=confirm&amp;action2={$suspendaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( 'Are you sure you want to ' . strtolower( $suspendtext ) . " {$current_blog->domain} ?" ) );
</del><ins>+ $mature_url = network_admin_url( "edit.php?action=confirm&amp;action2={$matureaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( 'Are you sure you want to ' . strtolower( $maturetext ) . " {$current_blog->domain} as mature?" ) );
+ $suspend_url = network_admin_url( "edit.php?action=confirm&amp;action2={$suspendaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( 'Are you sure you want to ' . strtolower( $suspendtext ) . " {$current_blog->domain} ?" ) );
</ins><span class="cx">
</span><span class="cx"> /* Add the submenu items to the Super Admin menu */
</span><del>- $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Blog Dashboard' ), 'href' => admin_url(), 'position' => 10 ) );
- $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Blog Options' ), 'href' => admin_url( "ms-sites.php?action=blogs&amp;searchaction=id&amp;s={$current_blog->blog_id}" ), 'position' => 30 ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Site Dashboard' ), 'href' => admin_url(), 'position' => 10 ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Site Options' ), 'href' => network_admin_url( "sites.php?action=blogs&amp;searchaction=id&amp;s={$current_blog->blog_id}" ), 'position' => 30 ) );
</ins><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => "$maturetext", 'href' => $mature_url, 'position' => 50 ) );
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => "$suspendtext", 'href' => $suspend_url, 'position' => 80 ) );
</span><span class="cx"> }
</span><span class="lines">@@ -153,4 +153,4 @@
</span><span class="cx"> return (object) $stats;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (15768 => 15769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-10-09 12:18:52 UTC (rev 15768)
+++ trunk/wp-includes/admin-bar.php 2010-10-09 12:22:00 UTC (rev 15769)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_account_menu', 20 );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Use the $wp_admin_bar global to add the "My Blogs/[Blog Name]" menu and all submenus.
</del><ins>+ * Use the $wp_admin_bar global to add the "My Sites/[Site Name]" menu and all submenus.
</ins><span class="cx"> */
</span><span class="cx"> function wp_admin_bar_my_blogs_menu() {
</span><span class="cx"> global $wpdb, $wp_admin_bar;
</span><span class="lines">@@ -110,9 +110,9 @@
</span><span class="cx"> if ( !is_object( $wp_admin_bar ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- /* Add the 'My Dashboards' menu if the user has more than one blog. */
</del><ins>+ /* Add the 'My Dashboards' menu if the user has more than one site. */
</ins><span class="cx"> if ( count( $wp_admin_bar->user->blogs ) > 1 ) {
</span><del>- $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blogs' ), 'href' => $wp_admin_bar->user->account_domain ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Sites' ), 'href' => $wp_admin_bar->user->account_domain ) );
</ins><span class="cx">
</span><span class="cx"> $default = includes_url('images/wpmini-blue.png');
</span><span class="cx">
</span><span class="lines">@@ -137,33 +137,33 @@
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/' ) );
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/post-new.php' ) );
</span><span class="cx"> // @todo, stats plugins should add this:
</span><del>- //$wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-s', 'title' => __( 'Blog Stats' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/index.php?page=stats' ) );
</del><ins>+ //$wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-s', 'title' => __( 'Site Stats' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/index.php?page=stats' ) );
</ins><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/edit-comments.php' ) );
</span><del>- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Read Blog' ), 'href' => constant( 'PROTO' ) . $blogdomain ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Read Site' ), 'href' => constant( 'PROTO' ) . $blogdomain ) );
</ins><span class="cx"> }
</span><span class="cx"> $counter++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* Add the "Manage Blogs" menu item */
- // @todo, use dashboard blog.
- $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'manage-blogs', 'title' => __( 'Manage Blogs' ), admin_url('my-sites.php') ) );
</del><ins>+ /* Add the "Manage Sites" menu item */
+ // @todo, use dashboard site.
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'manage-blogs', 'title' => __( 'Manage Sites' ), admin_url('my-sites.php') ) );
</ins><span class="cx">
</span><del>- /* Add the 'My Dashboard' menu if the user only has one blog. */
</del><ins>+ /* Add the 'My Dashboard' menu if the user only has one site. */
</ins><span class="cx"> } else {
</span><del>- $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blog' ), 'href' => $wp_admin_bar->user->account_domain ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Site' ), 'href' => $wp_admin_bar->user->account_domain ) );
</ins><span class="cx">
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-d', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-n', 'title' => __( 'New Post' ), 'href' => admin_url('post-new.php') ) );
</span><span class="cx"> // @todo Stats plugins should add this.
</span><del>- //$wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-s', 'title' => __( 'Blog Stats' ), 'href' => admin_ur;('index.php?page=stats') ) );
</del><ins>+ //$wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-s', 'title' => __( 'Site Stats' ), 'href' => admin_ur;('index.php?page=stats') ) );
</ins><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-c', 'title' => __( 'Manage Comments' ), 'href' => admin_url('edit-comments.php') ) );
</span><del>- $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-v', 'title' => __( 'Read Blog' ), 'href' => home_url() ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-v', 'title' => __( 'Read Site' ), 'href' => home_url() ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_blogs_menu', 30 );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Show the blavatar of the current blog as a separator.
</del><ins>+ * Show the blavatar of the current site as a separator.
</ins><span class="cx"> */
</span><span class="cx"> function wp_admin_bar_blog_separator() {
</span><span class="cx"> global $wp_admin_bar, $current_user, $current_blog;
</span><span class="lines">@@ -173,12 +173,12 @@
</span><span class="cx">
</span><span class="cx"> $default = includes_url('images/wpmini-blue.png');
</span><span class="cx">
</span><del>- $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '<img class="avatar" src="' . $default . '" alt="' . __( 'Current blog avatar' ) . '" width="16" height="16" />', 'href' => home_url() ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '<img class="avatar" src="' . $default . '" alt="' . __( 'Current site avatar' ) . '" width="16" height="16" />', 'href' => home_url() ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_blog_separator', 40 );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Use the $wp_admin_bar global to add a menu for blog info, accessable to all users.
</del><ins>+ * Use the $wp_admin_bar global to add a menu for site info, accessable to all users.
</ins><span class="cx"> */
</span><span class="cx"> function wp_admin_bar_bloginfo_menu() {
</span><span class="cx"> global $wp_admin_bar;
</span><span class="lines">@@ -186,8 +186,8 @@
</span><span class="cx"> if ( !is_object( $wp_admin_bar ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- /* Add the Blog Info menu */
- $wp_admin_bar->add_menu( array( 'id' => 'bloginfo', 'title' => __( 'Blog Info' ), 'href' => '' ) );
</del><ins>+ /* Add the Site Info menu */
+ $wp_admin_bar->add_menu( array( 'id' => 'bloginfo', 'title' => __( 'Site Info' ), 'href' => '' ) );
</ins><span class="cx">
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'bloginfo', 'title' => __( 'Get Shortlink' ), 'href' => '', 'meta' => array( 'onclick' => 'javascript:function wpcomshort() { var url=document.location;var links=document.getElementsByTagName(&#39;link&#39;);var found=0;for(var i = 0, l; l = links[i]; i++){if(l.getAttribute(&#39;rel&#39;)==&#39;shortlink&#39;) {found=l.getAttribute(&#39;href&#39;);break;}}if (!found) {for (var i = 0; l = document.links[i]; i++) {if (l.getAttribute(&#39;rel&#39;) == &#39;shortlink&#39;) {found = l.getAttribute(&#39;href&#39;);break;}}}if (found) {prompt(&#39;URL:&#39;, found);} else {alert(&#39;No shortlink available for this page&#39;); } } wpcomshort(); return false;' ) ) );
</span><span class="cx"> }
</span><span class="lines">@@ -332,4 +332,4 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter('locale', 'wp_admin_bar_lang');
</span><span class="cx">
</span><del>-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>