<!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>[14604] trunk/wp-includes/nav-menu-template.php:
More inline doc clarifications for wp_nav_menu.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14604">14604</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-13 18:47:35 +0000 (Thu, 13 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More inline doc clarifications for wp_nav_menu. fixes <a href="http://trac.wordpress.org/ticket/13370">#13370</a>, props jorbin.</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 (14603 => 14604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-05-13 17:34:43 UTC (rev 14603)
+++ trunk/wp-includes/nav-menu-template.php 2010-05-13 18:47:35 UTC (rev 14604)
</span><span class="lines">@@ -170,17 +170,19 @@
</span><span class="cx"> *
</span><span class="cx"> * Optional $args contents:
</span><span class="cx"> *
</span><del>- * menu - The menu id. Defaults to blank.
- * slug - The menu slug. Defaults to blank.
</del><ins>+ * menu - The menu that is desired. Accepts (matching in order) id, slug, name. Defaults to blank.
</ins><span class="cx"> * menu_class - CSS class to use for the ul container of the menu list. Defaults to 'menu'.
</span><span class="cx"> * container - Whether to wrap the ul, and what to wrap it with. Defaults to 'div'.
</span><ins>+ * conatiner_class - the class that is applied to the container. Defaults to blank.
</ins><span class="cx"> * fallback_cb - If the menu doesn't exists, a callback function will fire. Defaults to 'wp_page_menu'.
</span><span class="cx"> * before - Text before the link text.
</span><span class="cx"> * after - Text after the link text.
</span><span class="cx"> * link_before - Text before the link.
</span><span class="cx"> * link_after - Text after the link.
</span><span class="cx"> * echo - Whether to echo the menu or return it. Defaults to echo.
</span><ins>+ * depth - how many levels of the hierarchy are to be included. 0 means all. Defaults to 0.
</ins><span class="cx"> *
</span><ins>+ *
</ins><span class="cx"> * @todo show_home - If you set this argument, then it will display the link to the home page. The show_home argument really just needs to be set to the value of the text of the link.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="lines">@@ -199,7 +201,7 @@
</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><del>- // If we couldn't find a menu based off the name, id or slug,
</del><ins>+ // If we couldn't find a menu based off the menu argument
</ins><span class="cx"> // get the first menu that has items.
</span><span class="cx"> if ( ! $menu ) {
</span><span class="cx"> $menus = wp_get_nav_menus();
</span></span></pre>
</div>
</div>
</body>
</html>