<!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>[13368] trunk: Fallback to wp_page_menu() from wp_nav_menu()
if no menus are setup.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13368">13368</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-24 08:45:26 +0000 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fallback to wp_page_menu() from wp_nav_menu() if no menus are setup. Use wp_nav_menu() in twentyten. see <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenheaderphp">trunk/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</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="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (13367 => 13368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-02-24 08:10:27 UTC (rev 13367)
+++ trunk/wp-admin/nav-menus.php 2010-02-24 08:45:26 UTC (rev 13368)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/includes/nav-menu.php');
</span><span class="cx">
</span><span class="cx"> function wp_reset_nav_menu() {
</span><del>- wp_custom_navigation_setup(true);
</del><ins>+ wp_nav_menu_setup(true);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (13367 => 13368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-02-24 08:10:27 UTC (rev 13367)
+++ trunk/wp-content/themes/twentyten/header.php 2010-02-24 08:45:26 UTC (rev 13368)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="access">
</span><span class="cx"> <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
</span><del>- <?php wp_page_menu( 'sort_column=menu_order' ); ?>
</del><ins>+ <?php wp_nav_menu( 'sort_column=menu_order' ); ?>
</ins><span class="cx"> </div><!-- #access -->
</span><span class="cx">
</span><span class="cx"> </div><!-- #masthead -->
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (13367 => 13368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-02-24 08:10:27 UTC (rev 13367)
+++ trunk/wp-includes/default-widgets.php 2010-02-24 08:45:26 UTC (rev 13368)
</span><span class="lines">@@ -1126,7 +1126,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> //DISPLAY custom navigation menu
</span><span class="cx"> if ( get_option('wp_custom_nav_menu') == 'true' )
</span><del>- wp_nav_menu( array('id' => $navmenu, 'name' => $wp_custom_nav_menu_name, 'desc' => $navwidgetdescription) );
</del><ins>+ wp_nav_menu( array('id' => $navmenu, 'name' => $wp_custom_nav_menu_name, 'desc' => $navwidgetdescription, 'format' => 'widget') );
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (13367 => 13368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-02-24 08:10:27 UTC (rev 13367)
+++ trunk/wp-includes/nav-menu-template.php 2010-02-24 08:45:26 UTC (rev 13368)
</span><span class="lines">@@ -8,7 +8,37 @@
</span><span class="cx"> * @param array $args Arguments
</span><span class="cx"> */
</span><span class="cx"> function wp_nav_menu( $args = array() ) {
</span><ins>+ $defaults = array('id' => '', 'slug' => '', 'menu_class' => 'menu', 'format' => 'div');
+ $args = wp_parse_args($args, $defaults);
+ $args = (object) $args;
+
+ $menu = null;
+ if ( !empty($args->id) ) {
+ $menu = wp_get_nav_menu( $args->id );
+ } elseif ( !empty($args->slug) ) {
+ $menu = get_term_by('slug', $args->slug, 'nav_menu');
+ } else {
+ $menus = wp_get_nav_menus();
+ foreach ( $menus as $menu_maybe ) {
+ if ( wp_get_nav_menu_items($menu_maybe->term_id) ) {
+ $menu = $menu_maybe;
+ break;
+ }
+ }
+ }
+
+ if ( !$menu || is_wp_error($menu) )
+ return wp_page_menu( $args );
+
+ if ( 'div' == $args->format )
+ echo '<div class="' . esc_attr($args->menu_class) . '"><ul>';
+
+ $args->id = $menu->term_id;
+
</ins><span class="cx"> wp_print_nav_menu($args);
</span><ins>+
+ if ( 'div' == $args->format )
+ echo '</ul></div>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wp_print_nav_menu( $args = array() ) {
</span></span></pre>
</div>
</div>
</body>
</html>