<!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>[18026] trunk/wp-admin: Rename network admin submenus to not clash with top level menus.</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://trac.wordpress.org/changeset/18026">18026</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-05-24 21:58:01 +0000 (Tue, 24 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename network admin submenus to not clash with top level menus. Props ocean90, markmcwilliams. see <a href="http://trac.wordpress.org/ticket/17378">#17378</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminnetworkmenuphp">trunk/wp-admin/network/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 (18025 => 18026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2011-05-24 21:55:59 UTC (rev 18025)
+++ trunk/wp-admin/menu.php 2011-05-24 21:58:01 UTC (rev 18026)
</span><span class="lines">@@ -213,13 +213,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'div' );
</span><del>- $submenu['tools.php'][5] = array( __('Tools'), 'edit_posts', 'tools.php' );
</del><ins>+ $submenu['tools.php'][5] = array( __('Available Tools'), 'edit_posts', 'tools.php' );
</ins><span class="cx"> $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
</span><span class="cx"> $submenu['tools.php'][15] = array( __('Export'), 'export', 'export.php' );
</span><span class="cx"> if ( is_multisite() && !is_main_site() )
</span><span class="cx"> $submenu['tools.php'][25] = array( __('Delete Site'), 'manage_options', 'ms-delete-site.php' );
</span><span class="cx"> if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
</span><del>- $submenu['tools.php'][50] = array(__('Network'), 'manage_options', 'network.php');
</del><ins>+ $submenu['tools.php'][50] = array(__('Network Setup'), 'manage_options', 'network.php');
</ins><span class="cx">
</span><span class="cx"> $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div' );
</span><span class="cx"> $submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');
</span></span></pre></div>
<a id="trunkwpadminnetworkmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/menu.php (18025 => 18026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/menu.php 2011-05-24 21:55:59 UTC (rev 18025)
+++ trunk/wp-admin/network/menu.php 2011-05-24 21:58:01 UTC (rev 18026)
</span><span class="lines">@@ -14,11 +14,11 @@
</span><span class="cx">
</span><span class="cx"> /* translators: Sites menu item */
</span><span class="cx"> $menu[5] = array(__('Sites'), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'div');
</span><del>-$submenu['sites.php'][5] = array( __('Sites'), 'manage_sites', 'sites.php' );
</del><ins>+$submenu['sites.php'][5] = array( __('All Sites'), 'manage_sites', 'sites.php' );
</ins><span class="cx"> $submenu['sites.php'][10] = array( _x('Add New', 'site'), 'create_sites', 'site-new.php' );
</span><span class="cx">
</span><span class="cx"> $menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'div');
</span><del>-$submenu['users.php'][5] = array( __('Users'), 'manage_network_users', 'users.php' );
</del><ins>+$submenu['users.php'][5] = array( __('All Users'), 'manage_network_users', 'users.php' );
</ins><span class="cx"> $submenu['users.php'][10] = array( _x('Add New', 'user'), 'create_users', 'user-new.php' );
</span><span class="cx">
</span><span class="cx"> if ( current_user_can( 'update_themes' ) ) {
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
</span><span class="cx"> }
</span><del>-$submenu['themes.php'][5] = array( __('Themes'), 'manage_network_themes', 'themes.php' );
</del><ins>+$submenu['themes.php'][5] = array( __('Installed Themes'), 'manage_network_themes', 'themes.php' );
</ins><span class="cx"> $submenu['themes.php'][10] = array( _x('Add New', 'theme'), 'install_themes', 'theme-install.php' );
</span><span class="cx"> $submenu['themes.php'][15] = array( _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php' );
</span><span class="cx">
</span><span class="lines">@@ -42,14 +42,14 @@
</span><span class="cx"> } else {
</span><span class="cx"> $menu[20] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
</span><span class="cx"> }
</span><del>-$submenu['plugins.php'][5] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php' );
</del><ins>+$submenu['plugins.php'][5] = array( __('Installed Plugins'), 'manage_network_plugins', 'plugins.php' );
</ins><span class="cx"> $submenu['plugins.php'][10] = array( _x('Add New', 'plugin editor'), 'install_plugins', 'plugin-install.php' );
</span><span class="cx"> $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> $menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div');
</span><span class="cx"> if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
</span><del>- $submenu['settings.php'][5] = array( __('Settings'), 'manage_network_options', 'settings.php' );
</del><ins>+ $submenu['settings.php'][5] = array( __('Network Settings'), 'manage_network_options', 'settings.php' );
</ins><span class="cx"> $submenu['settings.php'][10] = array( __('Network Setup'), 'manage_network_options', 'setup.php' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> $menu[30] = array( __( 'Updates' ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$submenu[ 'upgrade.php' ][10] = array( __( 'Updates' ), 'update_core', 'update-core.php' );
</del><ins>+$submenu[ 'upgrade.php' ][10] = array( __( 'Available Updates' ), 'update_core', 'update-core.php' );
</ins><span class="cx"> $submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' );
</span><span class="cx"> unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>