<!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>[13532] trunk/wp-includes/nav-menu-template.php:
Fix notices inside wp_nav_menu(), Ensure echo =>
false is passed to fallback callbacks so the function doesnt print HTML directly
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13532">13532</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-03-01 12:53:51 +0000 (Mon, 01 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix notices inside wp_nav_menu(), Ensure echo => false is passed to fallback callbacks so the function doesnt print HTML directly. See <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (13531 => 13532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-03-01 12:32:00 UTC (rev 13531)
+++ trunk/wp-includes/nav-menu-template.php 2010-03-01 12:53:51 UTC (rev 13532)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx"> $args = apply_filters( 'wp_nav_menu_args', $args );
</span><span class="cx"> $args = (object) $args;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Get the nav menu
</span><span class="cx"> $menu = wp_get_nav_menu_object( $args->menu );
</span><span class="cx">
</span><span class="lines">@@ -44,21 +44,29 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- $args->menu = $menu->term_id;
</del><ins>+
+ if ( $menu )
+ $args->menu = $menu->term_id;
</ins><span class="cx"> $nav_menu = '';
</span><del>-
- if ( 'div' == $args->format )
- $nav_menu .= '<div id="menu-'. $menu->slug .'" class="' . esc_attr($args->menu_class) . '">';
-
</del><ins>+
+ if ( 'div' == $args->format ) {
+ if ( $menu )
+ $nav_menu .= '<div id="menu-' . $menu->slug . '" class="' . esc_attr($args->menu_class) . '">';
+ else
+ $nav_menu .= '<div id="menu-default">';
+ }
+
</ins><span class="cx"> $nav_menu .= wp_get_nav_menu( $args );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'div' == $args->format )
</span><span class="cx"> $nav_menu .= '</div>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $nav_menu = apply_filters( 'wp_nav_menu', $nav_menu );
</span><del>-
- return $args->echo ? print $nav_menu : $nav_menu;
</del><ins>+
+ if ( $args->echo )
+ echo $nav_menu;
+ else
+ return $nav_menu;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -83,8 +91,10 @@
</span><span class="cx">
</span><span class="cx"> // If no menu was found, call the fallback_cb
</span><span class="cx"> if ( !$menu || is_wp_error($menu) ) {
</span><del>- if ( function_exists($args->fallback_cb) )
- return call_user_func( $args->fallback_cb, $args );
</del><ins>+ if ( function_exists($args->fallback_cb) ) {
+ $_args = array_merge( (array)$args, array('echo' => false) );
+ return call_user_func( $args->fallback_cb, $_args );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $menu_items = wp_get_nav_menu_items( $menu->term_id );
</span></span></pre>
</div>
</div>
</body>
</html>