<!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>[56631] trunk: Taxonomy: Restrict term edit link generation in `WP_Terms_List_Table::handle_row_actions()`.</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/56631">56631</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/56631","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-09-20 08:08:42 +0000 (Wed, 20 Sep 2023)</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'>Taxonomy: Restrict term edit link generation in `WP_Terms_List_Table::handle_row_actions()`.
This changeset restricts edit term link generation if the user lacks the `edit_term` cap in order to prevent PHP 8.1+ deprecations shown when a user lacks this
capability and `get_edit_term_link()` returns null.
Props thelovekesh, jrf.
Fixes <a href="https://core.trac.wordpress.org/ticket/59336">#59336</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsadminwpTermsListTablephp">trunk/tests/phpunit/tests/admin/wpTermsListTable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></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-wp-terms-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2023-09-20 07:04:59 UTC (rev 56630)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2023-09-20 08:08:42 UTC (rev 56631)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,18 +474,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = $this->screen->taxonomy;
</span><span class="cx" style="display: block; padding: 0 10px"> $uri = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $edit_link = add_query_arg(
- 'wp_http_referer',
- urlencode( wp_unslash( $uri ) ),
- get_edit_term_link( $tag, $taxonomy, $this->screen->post_type )
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_term', $tag->term_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['edit'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" aria-label="%s">%s</a>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( $edit_link ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url(
+ add_query_arg(
+ 'wp_http_referer',
+ urlencode( wp_unslash( $uri ) ),
+ get_edit_term_link( $tag, $taxonomy, $this->screen->post_type )
+ )
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Taxonomy term name. */
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( sprintf( __( 'Edit “%s”' ), $tag->name ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Edit' )
</span></span></pre></div>
<a id="trunktestsphpunittestsadminwpTermsListTablephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/admin/wpTermsListTable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/wpTermsListTable.php (rev 0)
+++ trunk/tests/phpunit/tests/admin/wpTermsListTable.php 2023-09-20 08:08:42 UTC (rev 56631)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,88 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group admin
+ *
+ * @covers WP_Terms_List_Table
+ */
+class Tests_Admin_WpTermsListTable extends WP_UnitTestCase {
+
+ /**
+ * List table.
+ *
+ * @var WP_Terms_List_Table $terms_list_table
+ */
+ private $terms_list_table;
+
+ private static $admin_id;
+ private static $author_id;
+ private static $term_object;
+
+ const CATEGORY_TAXONOMY = 'category';
+
+ public static function set_up_before_class() {
+ parent::set_up_before_class();
+
+ self::$admin_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
+ self::$author_id = self::factory()->user->create( array( 'role' => 'author' ) );
+
+ self::$term_object = self::factory()->term->create_and_get( array( 'taxonomy' => self::CATEGORY_TAXONOMY ) );
+
+ require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+ require_once ABSPATH . 'wp-admin/includes/class-wp-terms-list-table.php';
+ }
+
+ public function set_up() {
+ parent::set_up();
+
+ $this->terms_list_table = new WP_Terms_List_Table();
+ }
+
+ /**
+ * Call an inaccessible (private or protected) method.
+ *
+ * @param object|string $object Object instance or class string to call the method of.
+ * @param string $method_name Name of the method to call.
+ * @param array $args Optional. Array of arguments to pass to the method.
+ * @return mixed Return value of the method call.
+ * @throws ReflectionException If the object could not be reflected upon.
+ */
+ private function call_inaccessible_method( $object, $method_name, $args = array() ) {
+ $method = ( new ReflectionClass( $object ) )->getMethod( $method_name );
+ $method->setAccessible( true );
+ return $method->invokeArgs( $object, $args );
+ }
+
+ /**
+ * @covers WP_Terms_List_Table::handle_row_actions()
+ *
+ * @ticket 59336
+ */
+ public function test_handle_row_actions_as_author() {
+ wp_set_current_user( self::$author_id );
+
+ $actions = $this->call_inaccessible_method( $this->terms_list_table, 'handle_row_actions', array( self::$term_object, 'title', 'title' ) );
+
+ $this->assertStringContainsString( '<div class="row-actions">', $actions, 'Row actions should be displayed.' );
+ $this->assertStringContainsString( 'View', $actions, 'View action should be displayed to the author.' );
+ $this->assertStringNotContainsString( 'Edit', $actions, 'Edit action should not be displayed to the author.' );
+ $this->assertStringNotContainsString( 'Delete', $actions, 'Delete action should not be displayed to the author.' );
+ }
+
+ /**
+ * @covers WP_Terms_List_Table::handle_row_actions()
+ *
+ * @ticket 59336
+ */
+ public function test_handle_row_actions_as_admin() {
+ wp_set_current_user( self::$admin_id );
+
+ $actions = $this->call_inaccessible_method( $this->terms_list_table, 'handle_row_actions', array( self::$term_object, 'title', 'title' ) );
+
+ $this->assertStringContainsString( '<div class="row-actions">', $actions, 'Row actions should be displayed.' );
+ $this->assertStringContainsString( 'View', $actions, 'View action should be displayed to the admin.' );
+ $this->assertStringContainsString( 'Edit', $actions, 'Edit action should be displayed to the admin.' );
+ $this->assertStringContainsString( 'Delete', $actions, 'Delete action should be displayed to the admin.' );
+ $this->assertStringContainsString( admin_url( 'term.php' ), $actions, 'Edit term link should be displayed to the admin.' );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/admin/wpTermsListTable.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>