<!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>[14611] trunk: add menu slots/theme_menus, props ryan, see #13378</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14611">14611</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-13 22:14:54 +0000 (Thu, 13 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add menu slots/theme_menus, props ryan, see <a href="http://trac.wordpress.org/ticket/13378">#13378</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenfunctionsphp">trunk/wp-content/themes/twentyten/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenheaderphp">trunk/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.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 (14610 => 14611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-05-13 21:44:37 UTC (rev 14610)
+++ trunk/wp-admin/nav-menus.php 2010-05-13 22:14:54 UTC (rev 14611)
</span><span class="lines">@@ -482,7 +482,18 @@
</span><span class="cx"> <input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="Enter menu name here." value="<?php echo esc_attr( $nav_menu_selected_title ); ?>" />
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </label>
</span><del>-
</del><ins>+ <?php if ( ! empty( $nav_menu_selected_id ) && $slots = get_registered_nav_menus() ) : ?>
+ <label class="menu-name-label howto open-label" for="menu-slot">
+ <span><?php _e('Theme Menu'); ?></span>
+ <select id="menu-slot" name="menu-slot">
+ <?php foreach ( $slots as $slot_key => $slot_text ) {
+ echo '<option value="' . esc_attr($slot_key) . '">' . esc_html($slot_text) . '</option>';
+ }
+ ?>
+ </select>
+ <br class="clear" />
+ </label>
+ <?php endif; ?>
</ins><span class="cx"> <div class="publishing-action">
</span><span class="cx"> <input class="button-primary" name="save_menu" type="submit" value="<?php empty($nav_menu_selected_id) ? esc_attr_e('Create Menu') : esc_attr_e('Save Menu'); ?>" />
</span><span class="cx"> </div><!--END .publishing-action-->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (14610 => 14611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-05-13 21:44:37 UTC (rev 14610)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-05-13 22:14:54 UTC (rev 14611)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> add_theme_support( 'post-thumbnails' );
</span><span class="cx">
</span><span class="cx"> // This theme uses wp_nav_menu()
</span><del>- add_theme_support( 'nav-menus' );
</del><ins>+ register_nav_menus( array('main' => __('Main Menu')) );
</ins><span class="cx">
</span><span class="cx"> // Add default posts and comments RSS feed links to head
</span><span class="cx"> add_theme_support( 'automatic-feed-links' );
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (14610 => 14611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-05-13 21:44:37 UTC (rev 14610)
+++ trunk/wp-content/themes/twentyten/header.php 2010-05-13 22:14:54 UTC (rev 14611)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="access" role="navigation">
</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_nav_menu( array( 'sort_column' => 'menu_order', 'container_class' => 'menu-header' ) ); ?>
</del><ins>+ <?php wp_nav_menu( array( 'sort_column' => 'menu_order', 'container_class' => 'menu-header', 'theme_menu' => 'main' ) ); ?>
</ins><span class="cx"> </div><!-- #access -->
</span><span class="cx"> </div><!-- #masthead -->
</span><span class="cx"> </div><!-- #header -->
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (14610 => 14611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-05-13 21:44:37 UTC (rev 14610)
+++ trunk/wp-includes/nav-menu-template.php 2010-05-13 22:14:54 UTC (rev 14611)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> function wp_nav_menu( $args = array() ) {
</span><span class="cx"> $defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'menu_class' => 'menu', 'echo' => true,
</span><span class="cx"> 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '',
</span><del>- 'depth' => 0, 'walker' => '', 'context' => 'frontend' );
</del><ins>+ 'depth' => 0, 'walker' => '', 'context' => 'frontend', 'theme_menu' => '' );
</ins><span class="cx">
</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="lines">@@ -202,6 +202,12 @@
</span><span class="cx"> // Get the nav menu
</span><span class="cx"> $menu = wp_get_nav_menu_object( $args->menu );
</span><span class="cx">
</span><ins>+ if ( ! $menu && $slot ) {
+ $slots = get_nav_menu_slots();
+ if ( isset($slots) && isset($slots['theme_menu']) )
+ $menu = wp_get_nav_menu_object( $slots['theme_menu'] );
+ }
+
</ins><span class="cx"> // If we couldn't find a menu based off the menu argument
</span><span class="cx"> // get the first menu that has items.
</span><span class="cx"> if ( ! $menu ) {
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (14610 => 14611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-05-13 21:44:37 UTC (rev 14610)
+++ trunk/wp-includes/nav-menu.php 2010-05-13 22:14:54 UTC (rev 14611)
</span><span class="lines">@@ -62,6 +62,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Register nav menus for a theme.
+ *
+ * @since 3.0.0
+ *
+ * @param array Associative array of menu slot identifiers and descriptions.
+ */
+function register_nav_menus( $menus = array() ) {
+ global $_wp_registered_nav_menus;
+
+ add_theme_support( 'nav-menus' );
+
+ $_wp_registered_nav_menus = $menus;
+}
+
+function get_registered_nav_menus() {
+ global $_wp_registered_nav_menus;
+
+ return $_wp_registered_nav_menus;
+}
+
+function get_nav_menu_slots() {
+ return get_theme_mod('nav_menu_slots');
+}
+
+/**
</ins><span class="cx"> * Determine whether the given ID is a nav menu item.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span></span></pre>
</div>
</div>
</body>
</html>