<!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>[13354] trunk/wp-includes/custom-navigation.php:
dont show items when menu empty, See #11817</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13354">13354</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-24 00:37:15 +0000 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>dont show items when menu empty, See <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescustomnavigationphp">trunk/wp-includes/custom-navigation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/custom-navigation.php (13353 => 13354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/custom-navigation.php 2010-02-24 00:18:18 UTC (rev 13353)
+++ trunk/wp-includes/custom-navigation.php 2010-02-24 00:37:15 UTC (rev 13354)
</span><span class="lines">@@ -56,26 +56,27 @@
</span><span class="cx"> function wp_get_nav_menu_items( $menu, $args = array() ) {
</span><span class="cx"> $items = get_objects_in_term( (int) $menu, 'nav_menu' );
</span><span class="cx">
</span><del>- $defaults = array( 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item', 'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order' );
- $args = wp_parse_args($args, $defaults);
- if ( count( $items ) > 1 )
- $args['include'] = implode( ',', $items );
- else
- $args['include'] = $items[0];
</del><ins>+ if ( ! empty( $items ) ) {
+ $defaults = array( 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item', 'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order' );
+ $args = wp_parse_args($args, $defaults);
+ if ( count( $items ) > 1 )
+ $args['include'] = implode( ',', $items );
+ else
+ $args['include'] = $items[0];
</ins><span class="cx">
</span><del>- $items = get_posts( $args );
</del><ins>+ $items = get_posts( $args );
</ins><span class="cx">
</span><del>- if ( ARRAY_A == $args['output'] ) {
- $output = array();
- foreach ( $items as $item ) {
- $output[$item->$args['output_key']] = $item;
</del><ins>+ if ( ARRAY_A == $args['output'] ) {
+ $output = array();
+ foreach ( $items as $item ) {
+ $output[$item->$args['output_key']] = $item;
+ }
+ unset($items);
+ ksort($output);
+ return $output;
</ins><span class="cx"> }
</span><del>- unset($items);
- ksort($output);
- return $output;
- } else {
- return $items;
</del><span class="cx"> }
</span><ins>+ return $items;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setup_menu_item($menu_item, $type = 'item', $position = 0) {
</span></span></pre>
</div>
</div>
</body>
</html>