<!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" />
<title>[48103] trunk/src/wp-content/themes: Docs: Synchronize and correct the documentation for `wp_nav_menu()` arguments in bundled themes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/48103">48103</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/48103","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-20 11:20:25 +0000 (Sat, 20 Jun 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Docs: Synchronize and correct the documentation for `wp_nav_menu()` arguments in bundled themes.
See <a href="https://core.trac.wordpress.org/ticket/49572">#49572</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfifteenfunctionsphp">trunk/src/wp-content/themes/twentyfifteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteeninciconfunctionsphp">trunk/src/wp-content/themes/twentynineteen/inc/icon-functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeeninciconfunctionsphp">trunk/src/wp-content/themes/twentyseventeen/inc/icon-functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentyinctemplatetagsphp">trunk/src/wp-content/themes/twentytwenty/inc/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfifteenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/functions.php 2020-06-20 11:16:12 UTC (rev 48102)
+++ trunk/src/wp-content/themes/twentyfifteen/functions.php 2020-06-20 11:20:25 UTC (rev 48103)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,10 +491,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $item_output The menu item output.
- * @param WP_Post $item Menu item object.
- * @param int $depth Depth of the menu.
- * @param array $args wp_nav_menu() arguments.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $item_output The menu item's starting HTML output.
+ * @param WP_Post $item Menu item data object.
+ * @param int $depth Depth of the menu. Used for padding.
+ * @param stdClass $args An object of wp_nav_menu() arguments.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Menu item with possible description.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_nav_description( $item_output, $item, $depth, $args ) {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentynineteeninciconfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/inc/icon-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/inc/icon-functions.php 2020-06-20 11:16:12 UTC (rev 48102)
+++ trunk/src/wp-content/themes/twentynineteen/inc/icon-functions.php 2020-06-20 11:20:25 UTC (rev 48103)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,10 +31,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Display SVG icons in social links menu.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $item_output The menu item output.
- * @param WP_Post $item Menu item object.
- * @param int $depth Depth of the menu.
- * @param object $args wp_nav_menu() arguments.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $item_output The menu item's starting HTML output.
+ * @param WP_Post $item Menu item data object.
+ * @param int $depth Depth of the menu. Used for padding.
+ * @param stdClass $args An object of wp_nav_menu() arguments.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The menu item output with social icon.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentynineteen_nav_menu_social_icons( $item_output, $item, $depth, $args ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,18 +54,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Add a dropdown icon to top-level menu items.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Nav menu item start element.
- * @param object $item Nav menu item.
- * @param int $depth Depth.
- * @param object $args Nav menu args.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $item_output The menu item's starting HTML output.
+ * @param WP_Post $item Menu item data object.
+ * @param int $depth Depth of the menu. Used for padding.
+ * @param stdClass $args An object of wp_nav_menu() arguments.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Nav menu item start element.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Add a dropdown icon to top-level menu items
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function twentynineteen_add_dropdown_icons( $output, $item, $depth, $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function twentynineteen_add_dropdown_icons( $item_output, $item, $depth, $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only add class to 'top level' items on the 'primary' menu.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $args->theme_location ) || 'menu-1' !== $args->theme_location ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $output;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $item_output;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( 'mobile-parent-nav-menu-item', $item->classes, true ) && isset( $item->original_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,18 +76,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace opening <a> with <button>.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output = preg_replace(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item_output = preg_replace(
</ins><span class="cx" style="display: block; padding: 0 10px"> '/<a\s.*?>/',
</span><span class="cx" style="display: block; padding: 0 10px"> $link,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item_output,
</ins><span class="cx" style="display: block; padding: 0 10px"> 1 // Limit.
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace closing </a> with </button>.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output = preg_replace(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item_output = preg_replace(
</ins><span class="cx" style="display: block; padding: 0 10px"> '#</a>#i',
</span><span class="cx" style="display: block; padding: 0 10px"> '</button>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item_output,
</ins><span class="cx" style="display: block; padding: 0 10px"> 1 // Limit.
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,12 +96,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add SVG icon to parent items.
</span><span class="cx" style="display: block; padding: 0 10px"> $icon = twentynineteen_get_icon_svg( 'keyboard_arrow_down', 24 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item_output .= sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> '<button class="submenu-expand" tabindex="-1">%s</button>',
</span><span class="cx" style="display: block; padding: 0 10px"> $icon
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $output;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $item_output;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'walker_nav_menu_start_el', 'twentynineteen_add_dropdown_icons', 10, 4 );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeeninciconfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/inc/icon-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/icon-functions.php 2020-06-20 11:16:12 UTC (rev 48102)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/icon-functions.php 2020-06-20 11:20:25 UTC (rev 48103)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,10 +117,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Display SVG icons in social links menu.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $item_output The menu item output.
- * @param WP_Post $item Menu item object.
- * @param int $depth Depth of the menu.
- * @param object $args wp_nav_menu() arguments.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $item_output The menu item's starting HTML output.
+ * @param WP_Post $item Menu item data object.
+ * @param int $depth Depth of the menu. Used for padding.
+ * @param stdClass $args An object of wp_nav_menu() arguments.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The menu item output with social icon.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyseventeen_nav_menu_social_icons( $item_output, $item, $depth, $args ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,10 +143,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Add dropdown icon if menu item has children.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $title The menu item's title.
- * @param WP_Post $item The current menu item.
- * @param object $args An array of wp_nav_menu() arguments.
- * @param int $depth Depth of menu item. Used for padding.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $title The menu item's title.
+ * @param WP_Post $item The current menu item.
+ * @param stdClass $args An object of wp_nav_menu() arguments.
+ * @param int $depth Depth of menu item. Used for padding.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The menu item's title with dropdown icon.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyseventeen_dropdown_icon_to_menu_link( $title, $item, $args, $depth ) {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentyinctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/inc/template-tags.php 2020-06-20 11:16:12 UTC (rev 48102)
+++ trunk/src/wp-content/themes/twentytwenty/inc/template-tags.php 2020-06-20 11:20:25 UTC (rev 48103)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,14 +499,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the class applied to wp_list_pages() items with children to match the menu class, to simplify.
</span><span class="cx" style="display: block; padding: 0 10px"> * styling of sub levels in the fallback. Only applied if the match_menu_classes argument is set.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $css_class CSS Class names.
- * @param string $item Comment.
- * @param int $depth Depth of the current comment.
- * @param array $args An array of arguments.
- * @param string $current_page Whether or not the item is the current item.
- * @return array $css_class CSS Class names.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string[] $css_class An array of CSS classes to be applied to each list item.
+ * @param WP_Post $page Page data object.
+ * @param int $depth Depth of page, used for padding.
+ * @param array $args An array of arguments.
+ * @param int $current_page ID of the current page.
+ * @return array CSS class names.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function twentytwenty_filter_wp_list_pages_item_classes( $css_class, $item, $depth, $args, $current_page ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function twentytwenty_filter_wp_list_pages_item_classes( $css_class, $page, $depth, $args, $current_page ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only apply to wp_list_pages() calls with match_menu_classes set to true.
</span><span class="cx" style="display: block; padding: 0 10px"> $match_menu_classes = isset( $args['match_menu_classes'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,10 +534,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Adds a Sub Nav Toggle to the Expanded Menu and Mobile Menu.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param stdClass $args An array of arguments.
- * @param string $item Menu item.
- * @param int $depth Depth of the current menu item.
- * @return stdClass $args An object of wp_nav_menu() arguments.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param stdClass $args An object of wp_nav_menu() arguments.
+ * @param WP_Post $item Menu item data object.
+ * @param int $depth Depth of menu item. Used for padding.
+ * @return stdClass An object of wp_nav_menu() arguments.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentytwenty_add_sub_toggles_to_main_menu( $args, $item, $depth ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,11 +580,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Displays SVG icons in social links menu.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $item_output The menu item output.
- * @param WP_Post $item Menu item object.
- * @param int $depth Depth of the menu.
- * @param array $args wp_nav_menu() arguments.
- * @return string $item_output The menu item output with social icon.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $item_output The menu item's starting HTML output.
+ * @param WP_Post $item Menu item data object.
+ * @param int $depth Depth of the menu. Used for padding.
+ * @param stdClass $args An object of wp_nav_menu() arguments.
+ * @return string The menu item output with social icon.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentytwenty_nav_menu_social_icons( $item_output, $item, $depth, $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Change SVG icon inside social links menu if there is supported URL.
</span></span></pre>
</div>
</div>
</body>
</html>