<!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>[51779] trunk/src: Code Modernization: Fix last 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/51779">51779</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/51779","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-09 12:38:36 +0000 (Thu, 09 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 last parameter name mismatches for parent/child classes in `Walker::start_el()`.
The parent class uses `$current_object_id` while most of the child classes use `$id`. As the parent class' is more descriptive, renaming the last parameter in each of child class.
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 or misleading, 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>, <a href="https://core.trac.wordpress.org/changeset/51739">[51739]</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-09 03:14:03 UTC (rev 51778)
+++ trunk/src/wp-admin/includes/class-walker-category-checklist.php 2021-09-09 12:38:36 UTC (rev 51779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,15 +61,16 @@
</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><del style="background-color: #fdd; 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$category` to `$data_object` and `$id` to `$current_object_id`
+ * 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 $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.
</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 $current_object_id Optional. ID of the current term. 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, $data_object, $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(), $current_object_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Restores the more descriptive, specific name for use within this method.
</span><span class="cx" style="display: block; padding: 0 10px"> $category = $data_object;
</span><span class="cx" style="display: block; padding: 0 10px">
</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-09 03:14:03 UTC (rev 51778)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php 2021-09-09 12:38:36 UTC (rev 51779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,18 +61,19 @@
</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><del style="background-color: #fdd; 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$item` to `$data_object` and `$id` to `$current_object_id`
+ * 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 $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.
</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 $current_object_id Optional. ID of the current menu item. 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, $data_object, $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, $current_object_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><span class="cx" style="display: block; padding: 0 10px"> // Restores the more descriptive, specific name for use within this method.
</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-09 03:14:03 UTC (rev 51778)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2021-09-09 12:38:36 UTC (rev 51779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,17 +46,18 @@
</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><del style="background-color: #fdd; 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$item` to `$data_object` and `$id` to `$current_object_id`
+ * 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 $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.
</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 $current_object_id Optional. ID of the current menu item. 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, $data_object, $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, $current_object_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_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"> // Restores the more descriptive, specific name for use within this method.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,13 +242,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 $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.
</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 $current_object_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, $menu_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, $current_object_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></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-09 03:14:03 UTC (rev 51778)
+++ trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php 2021-09-09 12:38:36 UTC (rev 51779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,19 +20,21 @@
</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><del style="background-color: #fdd; 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since Twenty Twenty 1.9 Renamed `$page` to `$data_object` and `$current_page` to `$current_object_id`
+ * 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 $data_object Page data object.
- * @param int $depth Optional. Depth of page. Used for padding. Default 0.
- * @param array $args Optional. Array of arguments. Default empty array.
- * @param int $current_page Optional. Page ID. 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_Post $data_object Page data object.
+ * @param int $depth Optional. Depth of page. Used for padding. Default 0.
+ * @param array $args Optional. Array of arguments. Default empty array.
+ * @param int $current_object_id Optional. ID of the current page. 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, $data_object, $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_object_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Restores the more descriptive, specific name for use within this method.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page = $data_object;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page = $data_object;
+ $current_page_id = $current_object_id;
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,12 +55,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $css_class[] = 'page_item_has_children';
</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">- if ( ! empty( $current_page ) ) {
- $_current_page = get_post( $current_page );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $current_page_id ) ) {
+ $_current_page = get_post( $current_page_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $_current_page && in_array( $page->ID, $_current_page->ancestors, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $css_class[] = 'current_page_ancestor';
</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 ( $page->ID === $current_page ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $page->ID === $current_page_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $css_class[] = 'current_page_item';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $_current_page && $page->ID === $_current_page->post_parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $css_class[] = 'current_page_parent';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +70,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/class-walker-page.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $css_classes = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $css_classes = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $css_classes = $css_classes ? ' class="' . esc_attr( $css_classes ) . '"' : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $page->post_title ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,10 +83,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $atts = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $atts['href'] = get_permalink( $page->ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $atts['aria-current'] = ( $page->ID === $current_page ) ? 'page' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $atts['aria-current'] = ( $page->ID === $current_page_id ) ? 'page' : '';
</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/class-walker-page.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $atts = apply_filters( 'page_menu_link_attributes', $atts, $page, $depth, $args, $current_page );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $atts = apply_filters( 'page_menu_link_attributes', $atts, $page, $depth, $args, $current_page_id );
</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></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-09 03:14:03 UTC (rev 51778)
+++ trunk/src/wp-includes/class-walker-category-dropdown.php 2021-09-09 12:38:36 UTC (rev 51779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,18 +44,19 @@
</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><del style="background-color: #fdd; 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$category` to `$data_object` and `$id` to `$current_object_id`
+ * 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 $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).
</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 $current_object_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, $data_object, $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(), $current_object_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Restores the more descriptive, specific name for use within this method.
</span><span class="cx" style="display: block; padding: 0 10px"> $category = $data_object;
</span><span class="cx" style="display: block; padding: 0 10px"> $pad = str_repeat( ' ', $depth * 3 );
</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-09 03:14:03 UTC (rev 51778)
+++ trunk/src/wp-includes/class-walker-category.php 2021-09-09 12:38:36 UTC (rev 51779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,18 +86,19 @@
</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><del style="background-color: #fdd; 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$category` to `$data_object` and `$id` to `$current_object_id`
+ * 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 $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.
</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 $current_object_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, $data_object, $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(), $current_object_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Restores the more descriptive, specific name for use within this method.
</span><span class="cx" style="display: block; padding: 0 10px"> $category = $data_object;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,12 +136,12 @@
</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 $title The title 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_Term $category Term data object.
- * @param int $depth Depth of category, used for padding.
- * @param array $args An array of arguments.
- * @param int $id ID of the current category.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Term $category Term data object.
+ * @param int $depth Depth of category, used for padding.
+ * @param array $args An array of arguments.
+ * @param int $current_object_id ID of the current category.
</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( 'category_list_link_attributes', $atts, $category, $depth, $args, $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $atts = apply_filters( 'category_list_link_attributes', $atts, $category, $depth, $args, $current_object_id );
</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></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-09 03:14:03 UTC (rev 51778)
+++ trunk/src/wp-includes/class-walker-comment.php 2021-09-09 12:38:36 UTC (rev 51779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,8 @@
</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><del style="background-color: #fdd; 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$comment` to `$data_object` and `$id` to `$current_object_id`
+ * 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">@@ -164,13 +165,13 @@
</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 $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).
</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 $current_object_id Optional. ID of the current comment. 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, $data_object, $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(), $current_object_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Restores the more descriptive, specific name for use within this method.
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = $data_object;
</span><span class="cx" style="display: block; padding: 0 10px">
</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-09 03:14:03 UTC (rev 51778)
+++ trunk/src/wp-includes/class-walker-nav-menu.php 2021-09-09 12:38:36 UTC (rev 51779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,17 +106,18 @@
</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><del style="background-color: #fdd; 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$item` to `$data_object` and `$id` to `$current_object_id`
+ * 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 $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.
</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 $current_object_id Optional. ID of the current menu item. 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, $data_object, $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, $current_object_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Restores the more descriptive, specific name for use within this method.
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item = $data_object;
</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-09 03:14:03 UTC (rev 51778)
+++ trunk/src/wp-includes/class-walker-page-dropdown.php 2021-09-09 12:38:36 UTC (rev 51779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,20 +44,22 @@
</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><del style="background-color: #fdd; 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$page` to `$data_object` and `$id` to `$current_object_id`
+ * 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 $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).
</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 $current_object_id Optional. ID of the current page. 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, $data_object, $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(), $current_object_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Restores the more descriptive, specific name for use within this method.
</span><span class="cx" style="display: block; padding: 0 10px"> $page = $data_object;
</span><span class="cx" style="display: block; padding: 0 10px"> $pad = str_repeat( ' ', $depth * 3 );
</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-09 03:14:03 UTC (rev 51778)
+++ trunk/src/wp-includes/class-walker-page.php 2021-09-09 12:38:36 UTC (rev 51779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,17 +93,19 @@
</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><del style="background-color: #fdd; 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Renamed `$page` to `$data_object` and `$current_page` to `$current_object_id`
+ * 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_Post $data_object Page data object.
- * @param int $depth Optional. Depth of page. Used for padding. Default 0.
- * @param array $args Optional. Array of arguments. Default empty array.
- * @param int $current_page Optional. Page ID. 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_Post $data_object Page data object.
+ * @param int $depth Optional. Depth of page. Used for padding. Default 0.
+ * @param array $args Optional. Array of arguments. Default empty array.
+ * @param int $current_object_id Optional. ID of the current page. 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, $data_object, $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_object_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Restores the more descriptive, specific name for use within this method.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page = $data_object;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page = $data_object;
+ $current_page_id = $current_object_id;
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,14 +126,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $css_class[] = 'page_item_has_children';
</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">- if ( ! empty( $current_page ) ) {
- $_current_page = get_post( $current_page );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $current_page_id ) ) {
+ $_current_page = get_post( $current_page_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_current_page && in_array( $page->ID, $_current_page->ancestors, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $css_class[] = 'current_page_ancestor';
</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">- if ( $page->ID == $current_page ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $page->ID == $current_page_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $css_class[] = 'current_page_item';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $_current_page && $page->ID === $_current_page->post_parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $css_class[] = 'current_page_parent';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,13 +149,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_list_pages()
</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[] $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.
</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 ID of the current page.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $css_classes = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $css_classes = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $css_classes = $css_classes ? ' class="' . esc_attr( $css_classes ) . '"' : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $page->post_title ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +168,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $atts = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $atts['href'] = get_permalink( $page->ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $atts['aria-current'] = ( $page->ID == $current_page ) ? 'page' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $atts['aria-current'] = ( $page->ID == $current_page_id ) ? '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 page menu item's anchor element.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,12 +181,12 @@
</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 $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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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 ID of the current page.
</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( 'page_menu_link_attributes', $atts, $page, $depth, $args, $current_page );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $atts = apply_filters( 'page_menu_link_attributes', $atts, $page, $depth, $args, $current_page_id );
</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></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-09 03:14:03 UTC (rev 51778)
+++ trunk/src/wp-includes/class-wp-walker.php 2021-09-09 12:38:36 UTC (rev 51779)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $data_object The data object.
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $current_object_id ID of the current item.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $current_object_id Optional. ID of the current item. Default 0.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {}
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>