<!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>[60821] branches/6.5: Grouped backports for the 6.5 branch.</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/60821">60821</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/60821","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-09-30 17:00:43 +0000 (Tue, 30 Sep 2025)</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'>Grouped backports for the 6.5 branch.
- REST API: Increase the specificity of capability checks for collections when the `edit` context is in use.
- Menus: Prevent HTML in menu item titles from being rendered unexpectedly.
Merges <a href="https://core.trac.wordpress.org/changeset/60814">[60814]</a>, <a href="https://core.trac.wordpress.org/changeset/60815">[60815]</a>, <a href="https://core.trac.wordpress.org/changeset/60816">[60816]</a> to the 6.5 branch.
Props andraganescu, desrosj, ehti, hurayraiit, iandunn, joehoyle, johnbillion, jorbin, mnelson4, noisysocks, peterwilsoncc, phillsav, rmccue, timothyblynjacobs, vortfu, westonruter , whyisjake, zieladam.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches65srcjs_enqueueslibnavmenujs">branches/6.5/src/js/_enqueues/lib/nav-menu.js</a></li>
<li><a href="#branches65srcjs_enqueueswpcustomizenavmenusjs">branches/6.5/src/js/_enqueues/wp/customize/nav-menus.js</a></li>
<li><a href="#branches65srcwpincludesclasswpcustomizenavmenusphp">branches/6.5/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#branches65srcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp">branches/6.5/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</a></li>
<li><a href="#branches65srcwpincludesrestapiendpointsclasswprestpostscontrollerphp">branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</a></li>
<li><a href="#branches65srcwpincludesrestapiendpointsclasswpresttermscontrollerphp">branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php</a></li>
<li><a href="#branches65srcwpincludesrestapiendpointsclasswprestuserscontrollerphp">branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php</a></li>
<li><a href="#branches65testsphpunittestscustomizenavmenuitemsettingphp">branches/6.5/tests/phpunit/tests/customize/nav-menu-item-setting.php</a></li>
<li><a href="#branches65testsphpunittestscustomizenavmenusphp">branches/6.5/tests/phpunit/tests/customize/nav-menus.php</a></li>
<li><a href="#branches65testsphpunittestsrestapirestuserscontrollerphp">branches/6.5/tests/phpunit/tests/rest-api/rest-users-controller.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches65">branches/6.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.5
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.5 2025-09-30 17:00:33 UTC (rev 60820)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.5 2025-09-30 17:00:43 UTC (rev 60821)
</ins><a id="branches65"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.5</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:57791-57792,57804-57806,57809,57814,57817,57824,57826-57827,57831-57832,57835,57840-57841,57845,57851,57864-57865,57868,57870-57871,57878,57881,57885-57888,57902-57905,57918,57925,57928,57931,57933,57948,58028,58030,58049,58068,58079,58157,58250,58252,58353,58396,58402,58570,59293,59682,59740,59969,60320,60735-60736
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:57791-57792,57804-57806,57809,57814,57817,57824,57826-57827,57831-57832,57835,57840-57841,57845,57851,57864-57865,57868,57870-57871,57878,57881,57885-57888,57902-57905,57918,57925,57928,57931,57933,57948,58028,58030,58049,58068,58079,58157,58250,58252,58353,58396,58402,58570,59293,59682,59740,59969,60320,60735-60736,60814-60816
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches65srcjs_enqueueslibnavmenujs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/src/js/_enqueues/lib/nav-menu.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/src/js/_enqueues/lib/nav-menu.js 2025-09-30 17:00:33 UTC (rev 60820)
+++ branches/6.5/src/js/_enqueues/lib/nav-menu.js 2025-09-30 17:00:43 UTC (rev 60821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1009,13 +1009,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.checked === true ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#pending-menu-items-to-delete ul' ).append(
- '<li data-menu-item-id="' + menuItemID + '">' +
- '<span class="pending-menu-item-name">' + menuItemName + '</span> ' +
- '<span class="pending-menu-item-type">(' + menuItemType + ')</span>' +
- '<span class="separator"></span>' +
- '</li>'
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const $li = $( '<li>', { 'data-menu-item-id': menuItemID } );
+ $li.append( $( '<span>', {
+ 'class': 'pending-menu-item-name',
+ text: menuItemName
+ } ) );
+ $li.append( ' ' );
+ $li.append( $( '<span>', {
+ 'class': 'pending-menu-item-type',
+ text: '(' + menuItemType + ')',
+ } ) );
+ $li.append( $( '<span>', { 'class': 'separator' } ) );
+ $( '#pending-menu-items-to-delete ul' ).append( $li );
</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"> $( '#pending-menu-items-to-delete li .separator' ).html( ', ' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1404,9 +1409,8 @@
</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"> eventOnClickMenuSave : function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var locs = '',
- menuName = $('#menu-name'),
- menuNameVal = menuName.val();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var menuName = $('#menu-name'),
+ menuNameVal = menuName.val();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cancel and warn if invalid menu name.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! menuNameVal || ! menuNameVal.replace( /\s+/, '' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1414,10 +1418,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Copy menu theme locations.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Note: This appears to be dead code since #nav-menu-theme-locations no longer exists, perhaps removed in r32842.
+ var $updateNavMenu = $('#update-nav-menu');
</ins><span class="cx" style="display: block; padding: 0 10px"> $('#nav-menu-theme-locations select').each(function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- locs += '<input type="hidden" name="' + this.name + '" value="' + $(this).val() + '" />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $updateNavMenu.append(
+ $( '<input>', {
+ type: 'hidden',
+ name: this.name,
+ value: $( this ).val(),
+ } )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#update-nav-menu').append( locs );
</del><span class="cx" style="display: block; padding: 0 10px"> // Update menu item position data.
</span><span class="cx" style="display: block; padding: 0 10px"> api.menuList.find('.menu-item-data-position').val( function(index) { return index + 1; } );
</span><span class="cx" style="display: block; padding: 0 10px"> window.onbeforeunload = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1460,7 +1471,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $item;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if( ! $items.length ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('.categorychecklist', panel).html( '<li><p>' + wp.i18n.__( 'No results found.' ) + '</p></li>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const li = $( '<li>' );
+ const p = $( '<p>', { text: wp.i18n.__( 'No results found.' ) } );
+ li.append( p );
+ $('.categorychecklist', panel).empty().append( li );
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '.spinner', panel ).removeClass( 'is-active' );
</span><span class="cx" style="display: block; padding: 0 10px"> wrapper.addClass( 'has-no-menu-item' );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></pre></div>
<a id="branches65srcjs_enqueueswpcustomizenavmenusjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/src/js/_enqueues/wp/customize/nav-menus.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/src/js/_enqueues/wp/customize/nav-menus.js 2025-09-30 17:00:33 UTC (rev 60820)
+++ branches/6.5/src/js/_enqueues/wp/customize/nav-menus.js 2025-09-30 17:00:43 UTC (rev 60821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,8 +526,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- this.currentMenuControl.addItemToMenu( menu_item.attributes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Leave the title as empty to reuse the original title as a placeholder if set.
+ var nav_menu_item = Object.assign( {}, menu_item.attributes );
+ if ( nav_menu_item.title === nav_menu_item.original_title ) {
+ nav_menu_item.title = '';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.currentMenuControl.addItemToMenu( nav_menu_item );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $( menuitemTpl ).find( '.menu-item-handle' ).addClass( 'item-added' );
</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">@@ -3033,7 +3039,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> item,
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> nav_menu_term_id: menuControl.params.menu_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- original_title: item.title,
</del><span class="cx" style="display: block; padding: 0 10px"> position: position
</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="branches65srcwpincludesclasswpcustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/src/wp-includes/class-wp-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/src/wp-includes/class-wp-customize-nav-menus.php 2025-09-30 17:00:33 UTC (rev 60820)
+++ branches/6.5/src/wp-includes/class-wp-customize-nav-menus.php 2025-09-30 17:00:43 UTC (rev 60821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,13 +191,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'post' !== $object_name && 0 === $page && $post_type->has_archive ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a post type archive link.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = $post_type->labels->archives;
</ins><span class="cx" style="display: block; padding: 0 10px"> $items[] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => $object_name . '-archive',
- 'title' => $post_type->labels->archives,
- 'type' => 'post_type_archive',
- 'type_label' => __( 'Post Type Archive' ),
- 'object' => $object_name,
- 'url' => get_post_type_archive_link( $object_name ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => $object_name . '-archive',
+ 'title' => $title,
+ 'original_title' => $title,
+ 'type' => 'post_type_archive',
+ 'type_label' => __( 'Post Type Archive' ),
+ 'object' => $object_name,
+ 'url' => get_post_type_archive_link( $object_name ),
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,14 +246,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_label = implode( ',', $post_states );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $items[] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => "post-{$post->ID}",
- 'title' => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
- 'type' => 'post_type',
- 'type_label' => $post_type_label,
- 'object' => $post->post_type,
- 'object_id' => (int) $post->ID,
- 'url' => get_permalink( (int) $post->ID ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => "post-{$post->ID}",
+ 'title' => $title,
+ 'original_title' => $title,
+ 'type' => 'post_type',
+ 'type_label' => $post_type_label,
+ 'object' => $post->post_type,
+ 'object_id' => (int) $post->ID,
+ 'url' => get_permalink( (int) $post->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"> } elseif ( 'taxonomy' === $object_type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,14 +280,16 @@
</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"> foreach ( $terms as $term ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $items[] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => "term-{$term->term_id}",
- 'title' => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
- 'type' => 'taxonomy',
- 'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
- 'object' => $term->taxonomy,
- 'object_id' => (int) $term->term_id,
- 'url' => get_term_link( (int) $term->term_id, $term->taxonomy ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => "term-{$term->term_id}",
+ 'title' => $title,
+ 'original_title' => $title,
+ 'type' => 'taxonomy',
+ 'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
+ 'object' => $term->taxonomy,
+ 'object_id' => (int) $term->term_id,
+ 'url' => get_term_link( (int) $term->term_id, $term->taxonomy ),
</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="branches65srcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2025-09-30 17:00:33 UTC (rev 60820)
+++ branches/6.5/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2025-09-30 17:00:43 UTC (rev 60821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'classes' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'xfn' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 'publish',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'original_title' => '',
</del><span class="cx" style="display: block; padding: 0 10px"> 'nav_menu_term_id' => 0, // This will be supplied as the $menu_id arg for wp_update_nav_menu_item().
</span><span class="cx" style="display: block; padding: 0 10px"> '_invalid' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,6 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|false Instance data array, or false if the item is marked for deletion.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function value() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $type_label = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_previewed && get_current_blog_id() === $this->_previewed_blog_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $undefined = new stdClass(); // Symbol.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_value = $this->post_value( $undefined );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,9 +219,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $post_value;
</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( $value ) && empty( $value['original_title'] ) ) {
- $value['original_title'] = $this->get_original_title( (object) $value );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $this->value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $this->value;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,6 +230,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post && self::POST_TYPE === $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $is_title_empty = empty( $post->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $value = (array) wp_setup_nav_menu_item( $post );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $value['type_label'] ) ) {
+ $type_label = $value['type_label'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $is_title_empty ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value['title'] = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,8 +249,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $this->value;
</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( $value ) && empty( $value['type_label'] ) ) {
- $value['type_label'] = $this->get_type_label( (object) $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // These properties are read-only and are part of the setting for use in the Customizer UI.
+ if ( is_array( $value ) ) {
+ $value_obj = (object) $value;
+ $value['type_label'] = isset( $type_label ) ? $type_label : $this->get_type_label( $value_obj );
+ $value['original_title'] = $this->get_original_title( $value_obj );
</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"> return $value;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,12 +260,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Prepares the value for editing on the client.
+ *
+ * @since 6.8.3
+ *
+ * @return array|false Value prepared for the client.
+ */
+ public function js_value() {
+ $value = parent::js_value();
+ if ( is_array( $value ) && isset( $value['original_title'] ) ) {
+ // Decode entities for the sake of displaying the original title as a placeholder.
+ $value['original_title'] = html_entity_decode( $value['original_title'], ENT_QUOTES, get_bloginfo( 'charset' ) );
+ }
+ return $value;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get original title.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $item Nav menu item.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string The original title.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string The original title, without entity decoding.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_original_title( $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +307,6 @@
</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="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $original_title = html_entity_decode( $original_title, ENT_QUOTES, get_bloginfo( 'charset' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> return $original_title;
</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">@@ -346,10 +364,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->value['post_status'] );
</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 ( ! isset( $this->value['original_title'] ) ) {
- $this->value['original_title'] = $this->get_original_title( (object) $this->value );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $this->value['nav_menu_term_id'] ) && $this->post_id > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = wp_get_post_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,11 +608,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $item->menu_order = $item->position;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $item->position );
</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->original_title ) ) {
- $item->original_title = $this->get_original_title( $item );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $item->title ) && ! empty( $item->original_title ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $item->title = $item->original_title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item->title = $item->original_title; // This is NOT entity-decoded. It comes from self::get_original_title().
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $item->title ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item->post_title = $item->title;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,7 +665,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0 Renamed `$menu_item_value` to `$value` for PHP 8 named parameter support.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $value The menu item value to sanitize.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array|false $value The menu item value to sanitize.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array|false|null|WP_Error Null or WP_Error if an input isn't valid. False if it is marked for deletion.
</span><span class="cx" style="display: block; padding: 0 10px"> * Otherwise the sanitized value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -711,8 +722,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_value[ $key ] = implode( ' ', array_map( 'sanitize_html_class', $value ) );
</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">- $menu_item_value['original_title'] = sanitize_text_field( $menu_item_value['original_title'] );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Apply the same filters as when calling wp_insert_post().
</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.php */
</span></span></pre></div>
<a id="branches65srcwpincludesrestapiendpointsclasswprestpostscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2025-09-30 17:00:33 UTC (rev 60820)
+++ branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2025-09-30 17:00:43 UTC (rev 60821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,7 +378,13 @@
</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"> foreach ( $query_result as $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $this->check_read_permission( $post ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'edit' === $request['context'] ) {
+ $permission = $this->check_update_permission( $post );
+ } else {
+ $permission = $this->check_read_permission( $post );
+ }
+
+ if ( ! $permission ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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="branches65srcwpincludesrestapiendpointsclasswpresttermscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2025-09-30 17:00:33 UTC (rev 60820)
+++ branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2025-09-30 17:00:43 UTC (rev 60821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,6 +340,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $query_result as $term ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'edit' === $request['context'] && ! current_user_can( 'edit_term', $term->term_id ) ) {
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = $this->prepare_item_for_response( $term, $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $response[] = $this->prepare_response_for_collection( $data );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches65srcwpincludesrestapiendpointsclasswprestuserscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php 2025-09-30 17:00:33 UTC (rev 60820)
+++ branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php 2025-09-30 17:00:43 UTC (rev 60821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +210,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'edit' === $request['context'] && ! current_user_can( 'list_users' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_forbidden_context',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Sorry, you are not allowed to list users.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Sorry, you are not allowed to edit users.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array( 'status' => rest_authorization_required_code() )
</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">@@ -340,6 +340,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $users = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $query->results as $user ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'edit' === $request['context'] && ! current_user_can( 'edit_user', $user->ID ) ) {
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = $this->prepare_item_for_response( $user, $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $users[] = $this->prepare_response_for_collection( $data );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,13 +443,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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 ( 'edit' === $request['context'] && ! current_user_can( 'list_users' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'edit' === $request['context'] && ! current_user_can( 'edit_user', $user->ID ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'rest_user_cannot_view',
- __( 'Sorry, you are not allowed to list users.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rest_forbidden_context',
+ __( 'Sorry, you are not allowed to edit this user.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array( 'status' => rest_authorization_required_code() )
</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 ( ! count_user_posts( $user->ID, $types ) && ! current_user_can( 'edit_user', $user->ID ) && ! current_user_can( 'list_users' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
+ if ( ! current_user_can( 'edit_user', $user->ID ) && ! current_user_can( 'list_users' ) && ! count_user_posts( $user->ID, $types ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_user_cannot_view',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Sorry, you are not allowed to list users.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1040,7 +1046,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data['slug'] = $user->user_nicename;
</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 ( in_array( 'roles', $fields, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'roles', $fields, true ) && ( current_user_can( 'list_users' ) || current_user_can( 'edit_user', $user->ID ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Defensively call array_values() to ensure an array is returned.
</span><span class="cx" style="display: block; padding: 0 10px"> $data['roles'] = array_values( $user->roles );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches65testsphpunittestscustomizenavmenuitemsettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/tests/phpunit/tests/customize/nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/tests/phpunit/tests/customize/nav-menu-item-setting.php 2025-09-30 17:00:33 UTC (rev 60820)
+++ branches/6.5/tests/phpunit/tests/customize/nav-menu-item-setting.php 2025-09-30 17:00:43 UTC (rev 60821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'classes' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'xfn' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 'publish',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'original_title' => '',
</del><span class="cx" style="display: block; padding: 0 10px"> 'nav_menu_term_id' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> '_invalid' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,7 +580,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'classes' => 'hello inject',
</span><span class="cx" style="display: block; padding: 0 10px"> 'xfn' => 'hello inject',
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 'draft',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'original_title' => 'Hi',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'original_title' => 'Hi<script>unfilteredHtml()</script>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'nav_menu_term_id' => 0,
</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="branches65testsphpunittestscustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/tests/phpunit/tests/customize/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/tests/phpunit/tests/customize/nav-menus.php 2025-09-30 17:00:33 UTC (rev 60820)
+++ branches/6.5/tests/phpunit/tests/customize/nav-menus.php 2025-09-30 17:00:43 UTC (rev 60821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,13 +168,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expected menu item array.
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => "post-{$post_id}",
- 'title' => 'Post Title',
- 'type' => 'post_type',
- 'type_label' => 'Post',
- 'object' => 'post',
- 'object_id' => (int) $post_id,
- 'url' => get_permalink( (int) $post_id ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => "post-{$post_id}",
+ 'title' => 'Post Title',
+ 'original_title' => 'Post Title',
+ 'type' => 'post_type',
+ 'type_label' => 'Post',
+ 'object' => 'post',
+ 'object_id' => (int) $post_id,
+ 'url' => get_permalink( (int) $post_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"> // Offset the query and get the second page of menu items.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,13 +201,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expected menu item array.
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => "post-{$page_id}",
- 'title' => 'Page Title',
- 'type' => 'post_type',
- 'type_label' => 'Page',
- 'object' => 'page',
- 'object_id' => (int) $page_id,
- 'url' => get_permalink( (int) $page_id ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => "post-{$page_id}",
+ 'title' => 'Page Title',
+ 'original_title' => 'Page Title',
+ 'type' => 'post_type',
+ 'type_label' => 'Page',
+ 'object' => 'page',
+ 'object_id' => (int) $page_id,
+ 'url' => get_permalink( (int) $page_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"> $items = $menus->load_available_items_query( 'post_type', 'page', 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,13 +228,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expected menu item array.
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => "post-{$post_id}",
- 'title' => 'Post Title',
- 'type' => 'post_type',
- 'type_label' => 'Post',
- 'object' => 'post',
- 'object_id' => (int) $post_id,
- 'url' => get_permalink( (int) $post_id ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => "post-{$post_id}",
+ 'title' => 'Post Title',
+ 'original_title' => 'Post Title',
+ 'type' => 'post_type',
+ 'type_label' => 'Post',
+ 'object' => 'post',
+ 'object_id' => (int) $post_id,
+ 'url' => get_permalink( (int) $post_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"> $items = $menus->load_available_items_query( 'post_type', 'post', 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,13 +255,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expected menu item array.
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => "term-{$term_id}",
- 'title' => 'Term Title',
- 'type' => 'taxonomy',
- 'type_label' => 'Category',
- 'object' => 'category',
- 'object_id' => (int) $term_id,
- 'url' => get_term_link( (int) $term_id, 'category' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => "term-{$term_id}",
+ 'title' => 'Term Title',
+ 'original_title' => 'Term Title',
+ 'type' => 'taxonomy',
+ 'type_label' => 'Category',
+ 'object' => 'category',
+ 'object_id' => (int) $term_id,
+ 'url' => get_term_link( (int) $term_id, 'category' ),
</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"> $items = $menus->load_available_items_query( 'taxonomy', 'category', 0 );
</span></span></pre></div>
<a id="branches65testsphpunittestsrestapirestuserscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/tests/phpunit/tests/rest-api/rest-users-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/tests/phpunit/tests/rest-api/rest-users-controller.php 2025-09-30 17:00:33 UTC (rev 60820)
+++ branches/6.5/tests/phpunit/tests/rest-api/rest-users-controller.php 2025-09-30 17:00:43 UTC (rev 60821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1202,7 +1202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $author_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'context', 'edit' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertErrorResponse( 'rest_user_cannot_view', $response, 401 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertErrorResponse( 'rest_forbidden_context', $response, 401 );
</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"> public function test_get_current_user() {
</span></span></pre>
</div>
</div>
</body>
</html>