<!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>[13361] trunk/wp-includes: s/custom_nav()/wp_nav_menu()/.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13361">13361</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-24 06:18:13 +0000 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>s/custom_nav()/wp_nav_menu()/. 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>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.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 (13360 => 13361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/custom-navigation.php 2010-02-24 05:45:38 UTC (rev 13360)
+++ trunk/wp-includes/custom-navigation.php 2010-02-24 06:18:13 UTC (rev 13361)
</span><span class="lines">@@ -49,6 +49,10 @@
</span><span class="cx"> return wp_insert_term( $menu_name, 'nav_menu' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function wp_get_nav_menu( $menu ) {
+ return get_term( (int) $menu, 'nav_menu');
+}
+
</ins><span class="cx"> function wp_get_nav_menus() {
</span><span class="cx"> return get_terms( 'nav_menu', array( 'hide_empty' => false ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (13360 => 13361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-02-24 05:45:38 UTC (rev 13360)
+++ trunk/wp-includes/default-widgets.php 2010-02-24 06:18:13 UTC (rev 13361)
</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>- custom_nav( 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) );
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (13360 => 13361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-02-24 05:45:38 UTC (rev 13360)
+++ trunk/wp-includes/general-template.php 2010-02-24 06:18:13 UTC (rev 13361)
</span><span class="lines">@@ -2216,11 +2216,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Outputs the Custom Navigation.
</del><ins>+ * Outputs a navigation menu.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><ins>+ *
+ * @param array $args Arguments
</ins><span class="cx"> */
</span><del>-function custom_nav($args = array()) {
</del><ins>+function wp_nav_menu( $args = array() ) {
</ins><span class="cx"> require_once (ABSPATH . WPINC . '/custom-navigation.php');
</span><span class="cx"> wp_custom_navigation_output($args);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>