<!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>[51739] trunk/src: Code Modernization: Fix reserved keyword and parameter name mismatches for parent/child classes in `Walker::start_el()`.</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/51739">51739</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/51739","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>hellofromTonya</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-09-08 15:35:32 +0000 (Wed, 08 Sep 2021)</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'>Code Modernization: Fix reserved keyword and parameter name mismatches for parent/child classes in `Walker::start_el()`.
In the parent class, renames the parameter `$object` to `$data_object`.
Why? `object` is a PHP reserved keyword.
In each child class: renames the corresponding parameter to match the parent's method signature.
Why?
PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.
Changes for readability:
- `@since` clearly specifies the original parameter name and its new name as well as why the change happened.
- in methods longer than a single line, the generic parameter is reassigned to the original parameter restoring it for context for use within the method. An inline comment is added to explain why this reassignment is made.
- in cases where the original parameter name was too generic, renamed (when reassigning) to a more descriptive name for use within the method.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/7737">[7737]</a>, <a href="https://core.trac.wordpress.org/changeset/8900">[8900]</a>, <a href="https://core.trac.wordpress.org/changeset/8970">[8970]</a>, <a href="https://core.trac.wordpress.org/changeset/14248">[14248]</a>, <a href="https://core.trac.wordpress.org/changeset/15077">[15077]</a>, <a href="https://core.trac.wordpress.org/changeset/16100">[16100]</a>, <a href="https://core.trac.wordpress.org/changeset/25642">[25642]</a>, <a href="https://core.trac.wordpress.org/changeset/25644">[25644]</a>, <a href="https://core.trac.wordpress.org/changeset/37051">[37051]</a>, <a href="https://core.trac.wordpress.org/changeset/37054">[37054]</a>, <a href="https://core.trac.wordpress.org/changeset/37056">[37056]</a>, <a href="https://core.trac.wordpress.org/changeset/46271">[46271]</a>, <a href="https://core.trac.wordpress.org/changeset/47189">[47189]</a>.
Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See <a href="https://core.trac.wordpress.org/ticket/51553">#51553</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswalkercategorychecklistphp">trunk/src/wp-admin/includes/class-walker-category-checklist.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenuchecklistphp">trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenueditphp">trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentywalkerpagephp">trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkercategorydropdownphp">trunk/src/wp-includes/class-walker-category-dropdown.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkercategoryphp">trunk/src/wp-includes/class-walker-category.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkercommentphp">trunk/src/wp-includes/class-walker-comment.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkernavmenuphp">trunk/src/wp-includes/class-walker-nav-menu.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkerpagedropdownphp">trunk/src/wp-includes/class-walker-page-dropdown.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkerpagephp">trunk/src/wp-includes/class-walker-page.php</a></li>
<li><a href="#trunksrcwpincludesclasswpwalkerphp">trunk/src/wp-includes/class-wp-walker.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswalkercategorychecklistphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-walker-category-checklist.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-category-checklist.php 2021-09-07 21:30:07 UTC (rev 51738)
+++ trunk/src/wp-admin/includes/class-walker-category-checklist.php 2021-09-08 15:35:32 UTC (rev 51739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,14 +61,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker::start_el()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.1
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$category` to `$data_object` to match parent class for PHP 8 named parameter support.
</ins><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 Used to append additional content (passed by reference).
- * @param WP_Term $category The current term object.
- * @param int $depth Depth of the term in reference to parents. Default 0.
- * @param array $args An array of arguments. @see wp_terms_checklist()
- * @param int $id ID of the current term.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Used to append additional content (passed by reference).
+ * @param WP_Term $data_object The current term object.
+ * @param int $depth Depth of the term in reference to parents. Default 0.
+ * @param array $args An array of arguments. @see wp_terms_checklist()
+ * @param int $id ID of the current term.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+ // Restores the more descriptive, specific name for use within this method.
+ $category = $data_object;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $args['taxonomy'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = 'category';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkernavmenuchecklistphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php 2021-09-07 21:30:07 UTC (rev 51738)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php 2021-09-08 15:35:32 UTC (rev 51739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,22 +61,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker_Nav_Menu::start_el()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$item` to `$data_object` to match parent class for PHP 8 named parameter support.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $_nav_menu_placeholder
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int|string $nav_menu_selected_id
</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 Used to append additional content (passed by reference).
- * @param WP_Post $item Menu item data object.
- * @param int $depth Depth of menu item. Used for padding.
- * @param stdClass $args Not used.
- * @param int $id Not used.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Used to append additional content (passed by reference).
+ * @param WP_Post $data_object Menu item data object.
+ * @param int $depth Depth of menu item. Used for padding.
+ * @param stdClass $args Not used.
+ * @param int $id Not used.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $data_object, $depth = 0, $args = null, $id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_nav_menu_placeholder, $nav_menu_selected_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Restores the more descriptive, specific name for use within this method.
+ $menu_item = $data_object;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? (int) $_nav_menu_placeholder - 1 : -1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' === $item->post_type ? $item->object_id : $_nav_menu_placeholder;
- $possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $possible_object_id = isset( $menu_item->post_type ) && 'nav_menu_item' === $menu_item->post_type ? $menu_item->object_id : $_nav_menu_placeholder;
+ $possible_db_id = ( ! empty( $menu_item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $menu_item->ID : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,24 +88,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= '<label class="menu-item-title">';
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= '<input type="checkbox"' . wp_nav_menu_disabled_check( $nav_menu_selected_id, false ) . ' class="menu-item-checkbox';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $item->front_or_home ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $menu_item->front_or_home ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= ' add-to-top';
</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">- $output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="' . esc_attr( $item->object_id ) . '" /> ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="' . esc_attr( $menu_item->object_id ) . '" /> ';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $item->label ) ) {
- $title = $item->label;
- } elseif ( isset( $item->post_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $menu_item->label ) ) {
+ $title = $menu_item->label;
+ } elseif ( isset( $menu_item->post_type ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post-template.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = apply_filters( 'the_title', $item->post_title, $item->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = apply_filters( 'the_title', $menu_item->post_title, $menu_item->ID );
</ins><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">- $output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= isset( $title ) ? esc_html( $title ) : esc_html( $menu_item->title );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $item->label ) && isset( $item->post_type ) && 'page' === $item->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $menu_item->label ) && isset( $menu_item->post_type ) && 'page' === $menu_item->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Append post states.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= _post_states( $item, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= _post_states( $menu_item, false );
</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"> $output .= '</label>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,15 +112,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Menu item hidden fields.
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= '<input type="hidden" class="menu-item-db-id" name="menu-item[' . $possible_object_id . '][menu-item-db-id]" value="' . $possible_db_id . '" />';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="' . esc_attr( $item->object ) . '" />';
- $output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="' . esc_attr( $item->menu_item_parent ) . '" />';
- $output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="' . esc_attr( $item->type ) . '" />';
- $output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="' . esc_attr( $item->title ) . '" />';
- $output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="' . esc_attr( $item->url ) . '" />';
- $output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="' . esc_attr( $item->target ) . '" />';
- $output .= '<input type="hidden" class="menu-item-attr-title" name="menu-item[' . $possible_object_id . '][menu-item-attr-title]" value="' . esc_attr( $item->attr_title ) . '" />';
- $output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="' . esc_attr( implode( ' ', $item->classes ) ) . '" />';
- $output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="' . esc_attr( $item->xfn ) . '" />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="' . esc_attr( $menu_item->object ) . '" />';
+ $output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="' . esc_attr( $menu_item->menu_item_parent ) . '" />';
+ $output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="' . esc_attr( $menu_item->type ) . '" />';
+ $output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="' . esc_attr( $menu_item->title ) . '" />';
+ $output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="' . esc_attr( $menu_item->url ) . '" />';
+ $output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="' . esc_attr( $menu_item->target ) . '" />';
+ $output .= '<input type="hidden" class="menu-item-attr-title" name="menu-item[' . $possible_object_id . '][menu-item-attr-title]" value="' . esc_attr( $menu_item->attr_title ) . '" />';
+ $output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="' . esc_attr( implode( ' ', $menu_item->classes ) ) . '" />';
+ $output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="' . esc_attr( $menu_item->xfn ) . '" />';
</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"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkernavmenueditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2021-09-07 21:30:07 UTC (rev 51738)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2021-09-08 15:35:32 UTC (rev 51739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,21 +46,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker_Nav_Menu::start_el()
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$item` to `$data_object` to match parent class for PHP 8 named parameter support.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $_wp_nav_menu_max_depth
</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 Used to append additional content (passed by reference).
- * @param WP_Post $item Menu item data object.
- * @param int $depth Depth of menu item. Used for padding.
- * @param stdClass $args Not used.
- * @param int $id Not used.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Used to append additional content (passed by reference).
+ * @param WP_Post $data_object Menu item data object.
+ * @param int $depth Depth of menu item. Used for padding.
+ * @param stdClass $args Not used.
+ * @param int $id Not used.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $data_object, $depth = 0, $args = null, $id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_nav_menu_max_depth;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Restores the more descriptive, specific name for use within this method.
+ $menu_item = $data_object;
</ins><span class="cx" style="display: block; padding: 0 10px"> $_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $item_id = esc_attr( $item->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item_id = esc_attr( $menu_item->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> $removed_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action',
</span><span class="cx" style="display: block; padding: 0 10px"> 'customlink-tab',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,18 +76,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'taxonomy' === $item->type ) {
- $original_object = get_term( (int) $item->object_id, $item->object );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'taxonomy' === $menu_item->type ) {
+ $original_object = get_term( (int) $menu_item->object_id, $menu_item->object );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $original_object && ! is_wp_error( $original_object ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = $original_object->name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'post_type' === $item->type ) {
- $original_object = get_post( $item->object_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_type' === $menu_item->type ) {
+ $original_object = get_post( $menu_item->object_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $original_object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = get_the_title( $original_object->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'post_type_archive' === $item->type ) {
- $original_object = get_post_type_object( $item->object );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_type_archive' === $menu_item->type ) {
+ $original_object = get_post_type_object( $menu_item->object );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $original_object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = $original_object->labels->archives;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,23 +95,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-item menu-item-depth-' . $depth,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'menu-item-' . esc_attr( $item->object ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'menu-item-' . esc_attr( $menu_item->object ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id === $_GET['edit-menu-item'] ) ? 'active' : 'inactive' ),
</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">- $title = $item->title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = $menu_item->title;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $item->_invalid ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $menu_item->_invalid ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'menu-item-invalid';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Title of an invalid menu item. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = sprintf( __( '%s (Invalid)' ), $item->title );
- } elseif ( isset( $item->post_status ) && 'draft' === $item->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = sprintf( __( '%s (Invalid)' ), $menu_item->title );
+ } elseif ( isset( $menu_item->post_status ) && 'draft' === $menu_item->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'pending';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Title of a menu item in draft status. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = sprintf( __( '%s (Pending)' ), $item->title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = sprintf( __( '%s (Pending)' ), $menu_item->title );
</ins><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">- $title = ( ! isset( $item->label ) || '' === $item->label ) ? $title : $item->label;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = ( ! isset( $menu_item->label ) || '' === $menu_item->label ) ? $title : $menu_item->label;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_text = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === $depth ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e( 'sub item' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="item-controls">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="item-type"><?php echo esc_html( $menu_item->type_label ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="item-order hide-if-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,11 +189,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-item-settings wp-clearfix" id="menu-item-settings-<?php echo $item_id; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'custom' === $item->type ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'custom' === $menu_item->type ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="field-url description description-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="edit-menu-item-url-<?php echo $item_id; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'URL' ); ?><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->url ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->url ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,18 +200,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description description-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="edit-menu-item-title-<?php echo $item_id; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Navigation Label' ); ?><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->title ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="field-title-attribute field-attr-title description description-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Title Attribute' ); ?><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->post_excerpt ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="field-link-target description">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="edit-menu-item-target-<?php echo $item_id; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $menu_item->target, '_blank' ); ?> />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Open link in a new tab' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,19 +218,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="field-css-classes description description-thin">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="edit-menu-item-classes-<?php echo $item_id; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'CSS Classes (optional)' ); ?><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode( ' ', $item->classes ) ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode( ' ', $menu_item->classes ) ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="field-xfn description description-thin">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="edit-menu-item-xfn-<?php echo $item_id; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Link Relationship (XFN)' ); ?><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->xfn ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->xfn ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="field-description description description-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="edit-menu-item-description-<?php echo $item_id; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Description' ); ?><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); // textarea_escaped ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $menu_item->description ); // textarea_escaped ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="description"><?php _e( 'The description will be displayed in the menu if the current theme supports it.' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,13 +241,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.4.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 int $item_id Menu item ID.
- * @param WP_Post $item Menu item data object.
- * @param int $depth Depth of menu item. Used for padding.
- * @param stdClass $args An object of menu item arguments.
- * @param int $id Nav menu ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $item_id Menu item ID.
+ * @param WP_Post $menu_item Menu item data object.
+ * @param int $depth Depth of menu item. Used for padding.
+ * @param stdClass $args An object of menu item arguments.
+ * @param int $id Nav menu ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'wp_nav_menu_item_custom_fields', $item_id, $item, $depth, $args, $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'wp_nav_menu_item_custom_fields', $item_id, $menu_item, $depth, $args, $id );
</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"> <fieldset class="field-move hide-if-no-js description description-wide">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,11 +260,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-item-actions description-wide submitbox">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'custom' !== $item->type && false !== $original_title ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'custom' !== $menu_item->type && false !== $original_title ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="link-to-original">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Link to menu item's original object. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Original: %s' ), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Original: %s' ), '<a href="' . esc_attr( $menu_item->url ) . '">' . esc_html( $original_title ) . '</a>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,11 +307,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="menu-item-data-db-id" type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object_id ); ?>" />
- <input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object ); ?>" />
- <input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_item_parent ); ?>" />
- <input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
- <input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->object_id ); ?>" />
+ <input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->object ); ?>" />
+ <input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->menu_item_parent ); ?>" />
+ <input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->menu_order ); ?>" />
+ <input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $menu_item->type ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .menu-item-settings-->
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="menu-item-transport"></ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentywalkerpagephp"></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/classes/class-twentytwenty-walker-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php 2021-09-07 21:30:07 UTC (rev 51738)
+++ trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php 2021-09-08 15:35:32 UTC (rev 51739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,16 +20,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Outputs the beginning of the current element in the tree.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Twenty 1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since Twenty Twenty 1.9 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker::start_el()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $output Used to append additional content. Passed by reference.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Post $page Page data object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Post $data_object Page data object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $depth Optional. Depth of page. Used for padding. Default 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Array of arguments. Default empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $current_page Optional. Page ID. Default 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">- public function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_page = 0 ) {
+ // Restores the more descriptive, specific name for use within this method.
+ $page = $data_object;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $t = "\t";
</span></span></pre></div>
<a id="trunksrcwpincludesclasswalkercategorydropdownphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-walker-category-dropdown.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-category-dropdown.php 2021-09-07 21:30:07 UTC (rev 51738)
+++ trunk/src/wp-includes/class-walker-category-dropdown.php 2021-09-08 15:35:32 UTC (rev 51739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,18 +44,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Starts the element output.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$category` to `$data_object` to match parent class for PHP 8 named parameter support.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker::start_el()
</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 Used to append additional content (passed by reference).
- * @param WP_Term $category Category data object.
- * @param int $depth Depth of category. Used for padding.
- * @param array $args Uses 'selected', 'show_count', and 'value_field' keys, if they exist.
- * See wp_dropdown_categories().
- * @param int $id Optional. ID of the current category. Default 0 (unused).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Used to append additional content (passed by reference).
+ * @param WP_Term $data_object Category data object.
+ * @param int $depth Depth of category. Used for padding.
+ * @param array $args Uses 'selected', 'show_count', and 'value_field' keys, if they exist.
+ * See wp_dropdown_categories().
+ * @param int $id Optional. ID of the current category. Default 0 (unused).
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
- $pad = str_repeat( ' ', $depth * 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+ // Restores the more descriptive, specific name for use within this method.
+ $category = $data_object;
+ $pad = str_repeat( ' ', $depth * 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/category-template.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_name = apply_filters( 'list_cats', $category->name, $category );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswalkercategoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-walker-category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-category.php 2021-09-07 21:30:07 UTC (rev 51738)
+++ trunk/src/wp-includes/class-walker-category.php 2021-09-08 15:35:32 UTC (rev 51739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,16 +86,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Starts the element output.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$category` to `$data_object` to match parent class for PHP 8 named parameter support.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker::start_el()
</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 Used to append additional content (passed by reference).
- * @param WP_Term $category Category data object.
- * @param int $depth Optional. Depth of category in reference to parents. Default 0.
- * @param array $args Optional. An array of arguments. See wp_list_categories(). Default empty array.
- * @param int $id Optional. ID of the current category. Default 0.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Used to append additional content (passed by reference).
+ * @param WP_Term $data_object Category data object.
+ * @param int $depth Optional. Depth of category in reference to parents. Default 0.
+ * @param array $args Optional. An array of arguments. See wp_list_categories().
+ * Default empty array.
+ * @param int $id Optional. ID of the current category. Default 0.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+ // Restores the more descriptive, specific name for use within this method.
+ $category = $data_object;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/category-template.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_name = apply_filters( 'list_cats', esc_attr( $category->name ), $category );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswalkercommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-walker-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-comment.php 2021-09-07 21:30:07 UTC (rev 51738)
+++ trunk/src/wp-includes/class-walker-comment.php 2021-09-08 15:35:32 UTC (rev 51739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,6 +157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Starts the element output.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$comment` to `$data_object` to match parent class for PHP 8 named parameter support.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker::start_el()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_list_comments()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,13 +164,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $comment_depth
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Comment $comment Global comment object.
</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 Used to append additional content. Passed by reference.
- * @param WP_Comment $comment Comment data object.
- * @param int $depth Optional. Depth of the current comment in reference to parents. Default 0.
- * @param array $args Optional. An array of arguments. Default empty array.
- * @param int $id Optional. ID of the current comment. Default 0 (unused).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Used to append additional content. Passed by reference.
+ * @param WP_Comment $data_object Comment data object.
+ * @param int $depth Optional. Depth of the current comment in reference to parents. Default 0.
+ * @param array $args Optional. An array of arguments. Default empty array.
+ * @param int $id Optional. ID of the current comment. Default 0 (unused).
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+ // Restores the more descriptive, specific name for use within this method.
+ $comment = $data_object;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $depth++;
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['comment_depth'] = $depth;
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['comment'] = $comment;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswalkernavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-walker-nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-nav-menu.php 2021-09-07 21:30:07 UTC (rev 51738)
+++ trunk/src/wp-includes/class-walker-nav-menu.php 2021-09-08 15:35:32 UTC (rev 51739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,16 +106,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0 The {@see 'nav_menu_item_args'} filter was added.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$item` to `$data_object` to match parent class for PHP 8 named parameter support.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker::start_el()
</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 Used to append additional content (passed by reference).
- * @param WP_Post $item Menu item data object.
- * @param int $depth Depth of menu item. Used for padding.
- * @param stdClass $args An object of wp_nav_menu() arguments.
- * @param int $id Current item ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Used to append additional content (passed by reference).
+ * @param WP_Post $data_object Menu item data object.
+ * @param int $depth Depth of menu item. Used for padding.
+ * @param stdClass $args An object of wp_nav_menu() arguments.
+ * @param int $id Current item ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $data_object, $depth = 0, $args = null, $id = 0 ) {
+ // Restores the more descriptive, specific name for use within this method.
+ $menu_item = $data_object;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args->item_spacing ) && 'discard' === $args->item_spacing ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $t = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $n = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,8 +129,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $indent = ( $depth ) ? str_repeat( $t, $depth ) : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes = empty( $item->classes ) ? array() : (array) $item->classes;
- $classes[] = 'menu-item-' . $item->ID;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes = empty( $menu_item->classes ) ? array() : (array) $menu_item->classes;
+ $classes[] = 'menu-item-' . $menu_item->ID;
</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"> * Filters the arguments for a single nav menu item.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,11 +137,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.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 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.
</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 $menu_item Menu item data object.
+ * @param int $depth Depth of menu item. Used for padding.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = apply_filters( 'nav_menu_item_args', $args, $item, $depth );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = apply_filters( 'nav_menu_item_args', $args, $menu_item, $depth );
</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"> * Filters the CSS classes applied to a menu item's list item element.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,12 +149,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0 The `$depth` parameter was added.
</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[] $classes Array of the CSS classes that are applied to the menu item's `<li>` element.
- * @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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string[] $classes Array of the CSS classes that are applied to the menu item's `<li>` element.
+ * @param WP_Post $menu_item The current menu item object.
+ * @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"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class_names = implode( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args, $depth ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class_names = implode( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $menu_item, $args, $depth ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $class_names = $class_names ? ' class="' . esc_attr( $class_names ) . '"' : '';
</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">@@ -159,26 +163,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.1
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0 The `$depth` parameter was added.
</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 $menu_id The ID that is applied to the menu item's `<li>` element.
- * @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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $menu_id The ID that is applied to the menu item's `<li>` element.
+ * @param WP_Post $menu_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"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = apply_filters( 'nav_menu_item_id', 'menu-item-' . $item->ID, $item, $args, $depth );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = apply_filters( 'nav_menu_item_id', 'menu-item-' . $menu_item->ID, $menu_item, $args, $depth );
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = $id ? ' id="' . esc_attr( $id ) . '"' : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= $indent . '<li' . $id . $class_names . '>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $atts = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $atts['title'] = ! empty( $item->attr_title ) ? $item->attr_title : '';
- $atts['target'] = ! empty( $item->target ) ? $item->target : '';
- if ( '_blank' === $item->target && empty( $item->xfn ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $atts['title'] = ! empty( $menu_item->attr_title ) ? $menu_item->attr_title : '';
+ $atts['target'] = ! empty( $menu_item->target ) ? $menu_item->target : '';
+ if ( '_blank' === $menu_item->target && empty( $menu_item->xfn ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $atts['rel'] = 'noopener';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $atts['rel'] = $item->xfn;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $atts['rel'] = $menu_item->xfn;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $atts['href'] = ! empty( $item->url ) ? $item->url : '';
- $atts['aria-current'] = $item->current ? 'page' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $atts['href'] = ! empty( $menu_item->url ) ? $menu_item->url : '';
+ $atts['aria-current'] = $menu_item->current ? 'page' : '';
</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"> * Filters the HTML attributes applied to a menu item's anchor element.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,11 +199,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $href The href attribute.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $aria-current The aria-current attribute.
</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 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Post $menu_item The current menu item object.
+ * @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"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args, $depth );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $atts = apply_filters( 'nav_menu_link_attributes', $atts, $menu_item, $args, $depth );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes = '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $atts as $attr => $value ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +214,7 @@
</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"> /** This filter is documented in wp-includes/post-template.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = apply_filters( 'the_title', $item->title, $item->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = apply_filters( 'the_title', $menu_item->title, $menu_item->ID );
</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"> * Filters a menu item's title.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,12 +221,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.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 $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.
</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 $menu_item The current menu item object.
+ * @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"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = apply_filters( 'nav_menu_item_title', $title, $item, $args, $depth );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = apply_filters( 'nav_menu_item_title', $title, $menu_item, $args, $depth );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $item_output = $args->before;
</span><span class="cx" style="display: block; padding: 0 10px"> $item_output .= '<a' . $attributes . '>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,11 +244,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $item_output The menu item's starting HTML output.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Post $item Menu item data object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Post $menu_item Menu item data object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $depth Depth of menu item. Used for padding.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param stdClass $args An object of wp_nav_menu() arguments.
</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 .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $menu_item, $depth, $args );
</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"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswalkerpagedropdownphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-walker-page-dropdown.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-page-dropdown.php 2021-09-07 21:30:07 UTC (rev 51738)
+++ trunk/src/wp-includes/class-walker-page-dropdown.php 2021-09-08 15:35:32 UTC (rev 51739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,20 +44,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Starts the element output.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker::start_el()
</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 Used to append additional content. Passed by reference.
- * @param WP_Post $page Page data object.
- * @param int $depth Optional. Depth of page in reference to parent pages. Used for padding.
- * Default 0.
- * @param array $args Optional. Uses 'selected' argument for selected page to set selected HTML
- * attribute for option element. Uses 'value_field' argument to fill "value"
- * attribute. See wp_dropdown_pages(). Default empty array.
- * @param int $id Optional. ID of the current page. Default 0 (unused).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Used to append additional content. Passed by reference.
+ * @param WP_Post $data_object Page data object.
+ * @param int $depth Optional. Depth of page in reference to parent pages. Used for padding.
+ * Default 0.
+ * @param array $args Optional. Uses 'selected' argument for selected page to set selected HTML
+ * attribute for option element. Uses 'value_field' argument to fill "value"
+ * attribute. See wp_dropdown_pages(). Default empty array.
+ * @param int $id Optional. ID of the current page. Default 0 (unused).
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function start_el( &$output, $page, $depth = 0, $args = array(), $id = 0 ) {
- $pad = str_repeat( ' ', $depth * 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $id = 0 ) {
+ // Restores the more descriptive, specific name for use within this method.
+ $page = $data_object;
+ $pad = str_repeat( ' ', $depth * 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $args['value_field'] ) || ! isset( $page->{$args['value_field']} ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['value_field'] = 'ID';
</span></span></pre></div>
<a id="trunksrcwpincludesclasswalkerpagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-walker-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-page.php 2021-09-07 21:30:07 UTC (rev 51738)
+++ trunk/src/wp-includes/class-walker-page.php 2021-09-08 15:35:32 UTC (rev 51739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,14 +93,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker::start_el()
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$page` to `$data_object` to match parent class for PHP 8 named parameter support.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $output Used to append additional content. Passed by reference.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Post $page Page data object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Post $data_object Page data object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $depth Optional. Depth of page. Used for padding. Default 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Array of arguments. Default empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $current_page Optional. Page ID. Default 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">- public function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_page = 0 ) {
+ // Restores the more descriptive, specific name for use within this method.
+ $page = $data_object;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $t = "\t";
</span><span class="cx" style="display: block; padding: 0 10px"> $n = "\n";
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpwalkerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-walker.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-walker.php 2021-09-07 21:30:07 UTC (rev 51738)
+++ trunk/src/wp-includes/class-wp-walker.php 2021-09-08 15:35:32 UTC (rev 51739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,15 +83,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * class methods. Includes the element output also.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$object` (a PHP reserved keyword) to `$data_object` for PHP 8 named parameter support.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @abstract
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $output Used to append additional content (passed by reference).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param object $object The data object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param object $data_object The data object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $depth Depth of the item.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An array of additional arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $current_object_id ID of the current item.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function start_el( &$output, $object, $depth = 0, $args = array(), $current_object_id = 0 ) {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {}
</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"> * Ends the element output, if needed.
</span></span></pre>
</div>
</div>
</body>
</html>