<!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>[16374] trunk/wp-admin/menu.php: Don'
t display Updates submenu in site admin.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16374">16374</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-14 18:49:18 +0000 (Sun, 14 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't display Updates submenu in site admin. See <a href="http://trac.wordpress.org/ticket/14435">#14435</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (16373 => 16374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-11-14 18:38:55 UTC (rev 16373)
+++ trunk/wp-admin/menu.php 2010-11-14 18:49:18 UTC (rev 16374)
</span><span class="lines">@@ -24,38 +24,35 @@
</span><span class="cx">
</span><span class="cx"> $menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'div' );
</span><span class="cx">
</span><del>-if ( is_multisite() || is_super_admin() ) {
- $submenu[ 'index.php' ][0] = array( __('Dashboard'), 'read', 'index.php' );
</del><ins>+$submenu[ 'index.php' ][0] = array( __('Dashboard'), 'read', 'index.php' );
</ins><span class="cx">
</span><del>- if ( is_multisite() )
- $submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
</del><ins>+if ( is_multisite() ) {
+ $submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
+} else {
+ $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
+ $update_plugins = get_site_transient( 'update_plugins' );
+ if ( !empty($update_plugins->response) )
+ $plugin_update_count = count( $update_plugins->response );
+ $update_themes = get_site_transient( 'update_themes' );
+ if ( !empty($update_themes->response) )
+ $theme_update_count = count( $update_themes->response );
+ $update_wordpress = get_core_updates( array('dismissed' => false) );
+ if ( !empty($update_wordpress) && !in_array( $update_wordpress[0]->response, array('development', 'latest') ) )
+ $wordpress_update_count = 1;
</ins><span class="cx">
</span><del>- if ( is_super_admin() ) {
- $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
- $update_plugins = get_site_transient( 'update_plugins' );
- if ( !empty($update_plugins->response) )
- $plugin_update_count = count( $update_plugins->response );
- $update_themes = get_site_transient( 'update_themes' );
- if ( !empty($update_themes->response) )
- $theme_update_count = count( $update_themes->response );
- $update_wordpress = get_core_updates( array('dismissed' => false) );
- if ( !empty($update_wordpress) && !in_array( $update_wordpress[0]->response, array('development', 'latest') ) )
- $wordpress_update_count = 1;
</del><ins>+ $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
+ $update_title = array();
+ if ( $wordpress_update_count )
+ $update_title[] = sprintf(__('%d WordPress Update'), $wordpress_update_count);
+ if ( $plugin_update_count )
+ $update_title[] = sprintf(_n('%d Plugin Update', '%d Plugin Updates', $plugin_update_count), $plugin_update_count);
+ if ( $theme_update_count )
+ $update_title[] = sprintf(_n('%d Theme Update', '%d Themes Updates', $theme_update_count), $theme_update_count);
</ins><span class="cx">
</span><del>- $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
- $update_title = array();
- if ( $wordpress_update_count )
- $update_title[] = sprintf(__('%d WordPress Update'), $wordpress_update_count);
- if ( $plugin_update_count )
- $update_title[] = sprintf(_n('%d Plugin Update', '%d Plugin Updates', $plugin_update_count), $plugin_update_count);
- if ( $theme_update_count )
- $update_title[] = sprintf(_n('%d Theme Update', '%d Themes Updates', $theme_update_count), $theme_update_count);
</del><ins>+ $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
</ins><span class="cx">
</span><del>- $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
-
- $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'install_plugins', 'update-core.php');
- unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);
- }
</del><ins>+ $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'install_plugins', 'update-core.php');
+ unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
</span></span></pre>
</div>
</div>
</body>
</html>