<!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>[17943] trunk/wp-admin: Remove links from the menu separators, see #17324</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/17943">17943</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-05-17 06:19:00 +0000 (Tue, 17 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove links from the menu separators, see <a href="http://trac.wordpress.org/ticket/17324">#17324</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuheaderphp">trunk/wp-admin/menu-header.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmenuheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu-header.php (17942 => 17943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu-header.php 2011-05-17 05:58:40 UTC (rev 17942)
+++ trunk/wp-admin/menu-header.php 2011-05-17 06:19:00 UTC (rev 17943)
</span><span class="lines">@@ -82,9 +82,7 @@
</span><span class="cx">
</span><span class="cx"> echo "\n\t<li$class$id>";
</span><span class="cx">
</span><del>- if ( false !== strpos($class, 'wp-menu-separator') ) {
- echo '<a class="separator" href="?unfoldmenu=1"><br /></a>';
- } elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
</del><ins>+ if ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
</ins><span class="cx"> $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
</span><span class="cx"> $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
</span><span class="cx"> $menu_file = $submenu[$item[2]][0][2];
</span><span class="lines">@@ -96,7 +94,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> echo "\n\t<div class='wp-menu-image'><a href='{$submenu[$item[2]][0][2]}'>$img</a></div>$arrow$toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
</span><span class="cx"> }
</span><del>- } else if ( current_user_can($item[1]) ) {
</del><ins>+ } else if ( !empty($item[2]) && current_user_can($item[1]) ) {
</ins><span class="cx"> $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
</span><span class="cx"> $menu_file = $item[2];
</span><span class="cx"> if ( false !== $pos = strpos($menu_file, '?') )
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (17942 => 17943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2011-05-17 05:58:40 UTC (rev 17942)
+++ trunk/wp-admin/menu.php 2011-05-17 06:19:00 UTC (rev 17943)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> unset($theme_update_count, $wordpress_update_count, $update_themes, $update_plugins, $update_wordpress);
</span><span class="cx">
</span><del>-$menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
</del><ins>+$menu[4] = array( '', 'read', '', '', 'wp-menu-separator' );
</ins><span class="cx">
</span><span class="cx"> $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' );
</span><span class="cx"> $submenu['edit.php'][5] = array( __('All Posts'), 'edit_posts', 'edit.php' );
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> }
</span><span class="cx"> unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax);
</span><span class="cx">
</span><del>-$menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );
</del><ins>+$menu[59] = array( '', 'read', '', '', 'wp-menu-separator' );
</ins><span class="cx">
</span><span class="cx"> if ( current_user_can( 'switch_themes') ) {
</span><span class="cx"> $menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx">
</span><span class="cx"> $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
</span><span class="cx">
</span><del>-$menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );
</del><ins>+$menu[99] = array( '', 'read', '', '', 'wp-menu-separator-last' );
</ins><span class="cx">
</span><span class="cx"> // Back-compat for old top-levels
</span><span class="cx"> $_wp_real_parent_file['post.php'] = 'edit.php';
</span></span></pre>
</div>
</div>
</body>
</html>