<!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>[14905] trunk: Menu notice and stlying fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14905">14905</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-25 21:44:34 +0000 (Tue, 25 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Menu notice and stlying fixes. Props filosofo. fixes <a href="http://trac.wordpress.org/ticket/12812">#12812</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenstylecss">trunk/wp-content/themes/twentyten/style.css</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/style.css (14904 => 14905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/style.css 2010-05-25 19:47:22 UTC (rev 14904)
+++ trunk/wp-content/themes/twentyten/style.css 2010-05-25 21:44:34 UTC (rev 14905)
</span><span class="lines">@@ -431,7 +431,9 @@
</span><span class="cx"> display:block;
</span><span class="cx"> }
</span><span class="cx"> #access ul li.current_page_item a ,
</span><del>-#access ul li.current-menu-item a {
</del><ins>+#access ul li.current-menu-ancestor a,
+#access ul li.current-menu-item a,
+#access ul li.current-menu-parent a {
</ins><span class="cx"> color: #fff;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1340,4 +1342,4 @@
</span><span class="cx"> .home .sticky {
</span><span class="cx"> border: none;
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (14904 => 14905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-05-25 19:47:22 UTC (rev 14904)
+++ trunk/wp-includes/nav-menu-template.php 2010-05-25 21:44:34 UTC (rev 14905)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> // Back compat classes for pages to match wp_page_menu()
</span><span class="cx"> $classes[] = 'page_item';
</span><span class="cx"> $classes[] = 'page-item-' . $item->object_id;
</span><del>- if ( !empty($item->classes) ) {
</del><ins>+ if ( ! empty( $item->classes ) ) {
</ins><span class="cx"> if ( in_array('current-menu-item', $classes) )
</span><span class="cx"> $classes[] = 'current_page_item';
</span><span class="cx"> if ( in_array('current-menu-parent', $classes) )
</span><span class="lines">@@ -361,8 +361,14 @@
</span><span class="cx">
</span><span class="cx"> // set parent's class
</span><span class="cx"> foreach ( (array) $menu_items as $key => $parent_item ) {
</span><del>- if ( 'post_type' == $parent_item->type && is_post_type_hierarchical( $queried_object->post_type ) && in_array( $parent_item->object_id, $queried_object->ancestors ) )
- $menu_items[$key]->classes = trim( $parent_item->classes . ' ' . 'current-' . $queried_object->post_type . '-ancestor' );
</del><ins>+ if (
+ isset( $parent_item->type ) &&
+ 'post_type' == $parent_item->type &&
+ ! empty( $queried_object->post_type ) &&
+ is_post_type_hierarchical( $queried_object->post_type ) &&
+ in_array( $parent_item->object_id, $queried_object->ancestors )
+ )
+ $menu_items[$key]->classes = trim( $parent_item->classes . ' ' . 'current-' . $queried_object->post_type . '-ancestor current-menu-ancestor' );
</ins><span class="cx"> if ( in_array( $parent_item->db_id, $active_parent_item_ids ) )
</span><span class="cx"> $menu_items[$key]->classes = trim( $parent_item->classes . ' ' . 'current-menu-parent' );
</span><span class="cx"> if ( in_array( $parent_item->object_id, $active_parent_object_ids ) )
</span></span></pre>
</div>
</div>
</body>
</html>