<!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>[52180] trunk: Taxonomy: Allow `get_*_*_link()` and `edit_term_link()` functions to accept a term ID, `WP_Term`, or term object.</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/52180">52180</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/52180","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-11-16 14:55:04 +0000 (Tue, 16 Nov 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'>Taxonomy: Allow `get_*_*_link()` and `edit_term_link()` functions to accept a term ID, `WP_Term`, or term object.
`get_term()` accepts a term ID, instance of `WP_Term`, or an object (i.e. `stdClass` as a result of a db query). Functions that use `get_term()` also now allow for the same data types.
Why? For consistency, removing extra processing code in consuming functions, and performance.
Functions changed in this commit are:
* `get_category_feed_link()`
* `get_term_feed_link()`
* `get_tag_feed_link()`
* `get_edit_tag_link()`
* `get_edit_term_link()`
* `edit_term_link()`
For each of consumer of these functions, changes to pass the object instead of the term ID.
Includes unit/integration tests for test coverage of these changes.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/6365">[6365]</a>, <a href="https://core.trac.wordpress.org/changeset/9136">[9136]</a>, <a href="https://core.trac.wordpress.org/changeset/9340">[9340]</a>, <a href="https://core.trac.wordpress.org/changeset/14711">[14711]</a>, <a href="https://core.trac.wordpress.org/changeset/15792">[15792]</a>, <a href="https://core.trac.wordpress.org/changeset/15800">[15800]</a>, <a href="https://core.trac.wordpress.org/changeset/18827">[18827]</a>, <a href="https://core.trac.wordpress.org/changeset/32606">[32606]</a>, <a href="https://core.trac.wordpress.org/changeset/36646">[36646]</a>, <a href="https://core.trac.wordpress.org/changeset/37252">[37252]</a>.
Props davidbinda, johnbillion, peterwilsoncc, hellofromTonya, sergeybiryukov, mista-flo, hareesh-pillai, audrasjb, jeffpaul, chaion07.
Fixes <a href="https://core.trac.wordpress.org/ticket/50225">#50225</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkercategoryphp">trunk/src/wp-includes/class-walker-category.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermLinkphp">trunk/tests/phpunit/tests/term/getTermLink.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestslinkeditTermLinkphp">trunk/tests/phpunit/tests/link/editTermLink.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetEditTermLinkphp">trunk/tests/phpunit/tests/link/getEditTermLink.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 2021-11-16 14:17:26 UTC (rev 52179)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2021-11-16 14:55:04 UTC (rev 52180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,7 +397,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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 = get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $edit_link = get_edit_term_link( $tag, $taxonomy, $this->screen->post_type );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $edit_link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $edit_link = add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $edit_link = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_http_referer',
</span><span class="cx" style="display: block; padding: 0 10px"> urlencode( wp_unslash( $uri ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_edit_term_link( $tag, $taxonomy, $this->screen->post_type )
</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"> $actions = array();
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></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/category-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2021-11-16 14:17:26 UTC (rev 52179)
+++ trunk/src/wp-includes/category-template.php 2021-11-16 14:55:04 UTC (rev 52180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,9 +737,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $tags as $key => $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'edit' === $args['link'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = get_edit_term_link( $tag->term_id, $tag->taxonomy, $args['post_type'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = get_edit_term_link( $tag, $tag->taxonomy, $args['post_type'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = get_term_link( (int) $tag->term_id, $tag->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = get_term_link( $tag, $tag->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"> if ( is_wp_error( $link ) ) {
</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-11-16 14:17:26 UTC (rev 52179)
+++ trunk/src/wp-includes/class-walker-category.php 2021-11-16 14:55:04 UTC (rev 52180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link .= '(';
</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">- $link .= '<a href="' . esc_url( get_term_feed_link( $category->term_id, $category->taxonomy, $args['feed_type'] ) ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link .= '<a href="' . esc_url( get_term_feed_link( $category, $category->taxonomy, $args['feed_type'] ) ) . '"';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $args['feed'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Category name. */
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></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/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2021-11-16 14:17:26 UTC (rev 52179)
+++ trunk/src/wp-includes/link-template.php 2021-11-16 14:55:04 UTC (rev 52180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -904,13 +904,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.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 $cat_id Category ID.
- * @param string $feed Optional. Feed type. Possible values include 'rss2', 'atom'.
- * Default is the value of get_default_feed().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|WP_Term|object $cat The ID or term object whose feed link will be retrieved.
+ * @param string $feed Optional. Feed type. Possible values include 'rss2', 'atom'.
+ * Default is the value of get_default_feed().
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Link to the feed for the category specified by $cat_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">-function get_category_feed_link( $cat_id, $feed = '' ) {
- return get_term_feed_link( $cat_id, 'category', $feed );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_category_feed_link( $cat, $feed = '' ) {
+ return get_term_feed_link( $cat, 'category', $feed );
</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">@@ -921,16 +921,22 @@
</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"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $term_id Term ID.
- * @param string $taxonomy Optional. Taxonomy of `$term_id`. Default 'category'.
- * @param string $feed Optional. Feed type. Possible values include 'rss2', 'atom'.
- * Default is the value of get_default_feed().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|WP_Term|object $term The ID or term object whose feed link will be retrieved.
+ * @param string $taxonomy Optional. Taxonomy of `$term_id`.
+ * Defaults to 'category' if term ID or non WP_Term object is passed.
+ * @param string $feed Optional. Feed type. Possible values include 'rss2', 'atom'.
+ * Default is the value of get_default_feed().
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string|false Link to the feed for the term specified by $term_id and $taxonomy.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
- $term_id = (int) $term_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_term_feed_link( $term, $taxonomy = '', $feed = '' ) {
+ if ( ! is_object( $term ) ) {
+ $term = (int) $term;
+ $taxonomy = 'category';
+ } elseif ( ! $term instanceof WP_Term ) {
+ $taxonomy = $term->taxonomy;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = get_term( $term_id, $taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = get_term( $term, $taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $term ) || is_wp_error( $term ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -944,7 +950,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $permalink_structure ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'category' === $taxonomy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = home_url( "?feed=$feed&cat=$term_id" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = home_url( "?feed=$feed&cat=$term->term_id" );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'post_tag' === $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = home_url( "?feed=$feed&tag=$term->slug" );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -952,7 +958,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link = home_url( "?feed=$feed&$t->query_var=$term->slug" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = get_term_link( $term_id, $term->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = get_term_link( $term, $term->taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( get_default_feed() == $feed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $feed_link = 'feed';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1003,13 +1009,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.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 $tag_id Tag ID.
- * @param string $feed Optional. Feed type. Possible values include 'rss2', 'atom'.
- * Default is the value of get_default_feed().
- * @return string The feed permalink for the given tag.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|WP_Term|object $tag The ID or term object whose feed link will be retrieved.
+ * @param string $feed Optional. Feed type. Possible values include 'rss2', 'atom'.
+ * Default is the value of get_default_feed().
+ * @return string The feed permalink for the given tag.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_tag_feed_link( $tag_id, $feed = '' ) {
- return get_term_feed_link( $tag_id, 'post_tag', $feed );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_tag_feed_link( $tag, $feed = '' ) {
+ return get_term_feed_link( $tag, 'post_tag', $feed );
</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">@@ -1017,11 +1023,11 @@
</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><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 $tag_id Tag ID.
- * @param string $taxonomy Optional. Taxonomy slug. Default 'post_tag'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|WP_Term|object $tag The ID or term object whose edit link will be retrieved.
+ * @param string $taxonomy Optional. Taxonomy slug. Default 'post_tag'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The edit tag link URL for the given tag.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_edit_tag_link( $tag_id, $taxonomy = 'post_tag' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_edit_tag_link( $tag, $taxonomy = 'post_tag' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the edit link for a tag (or term in another taxonomy).
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1029,7 +1035,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $link The term edit link.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_edit_tag_link', get_edit_term_link( $tag_id, $taxonomy ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_edit_tag_link', get_edit_term_link( $tag, $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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1062,28 +1068,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.0 The `$taxonomy` parameter was made optional.
</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 $term_id Term ID.
- * @param string $taxonomy Optional. Taxonomy. Defaults to the taxonomy of the term identified
- * by `$term_id`.
- * @param string $object_type Optional. The object type. Used to highlight the proper post type
- * menu on the linked page. Defaults to the first object_type associated
- * with the taxonomy.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|WP_Term|object $term The ID or term object whose edit link will be retrieved.
+ * @param string $taxonomy Optional. Taxonomy. Defaults to the taxonomy of the term identified
+ * by `$term`.
+ * @param string $object_type Optional. The object type. Used to highlight the proper post type
+ * menu on the linked page. Defaults to the first object_type associated
+ * with the taxonomy.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string|null The edit term link URL for the given term, or null on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_edit_term_link( $term_id, $taxonomy = '', $object_type = '' ) {
- $term = get_term( $term_id, $taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_edit_term_link( $term, $taxonomy = '', $object_type = '' ) {
+ $term = get_term( $term, $taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $term || is_wp_error( $term ) ) {
</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">- $tax = get_taxonomy( $term->taxonomy );
- if ( ! $tax || ! current_user_can( 'edit_term', $term->term_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax = get_taxonomy( $term->taxonomy );
+ $term_id = $term->term_id;
+ if ( ! $tax || ! current_user_can( 'edit_term', $term_id ) ) {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $taxonomy,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'tag_ID' => $term->term_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tag_ID' => $term_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"> if ( $object_type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1116,16 +1123,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $link Optional. Anchor text. If empty, default is 'Edit This'. Default empty.
- * @param string $before Optional. Display before edit link. Default empty.
- * @param string $after Optional. Display after edit link. Default empty.
- * @param WP_Term $term Optional. Term object. If null, the queried object will be inspected. Default null.
- * @param bool $echo Optional. Whether or not to echo the return. Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $link Optional. Anchor text. If empty, default is 'Edit This'. Default empty.
+ * @param string $before Optional. Display before edit link. Default empty.
+ * @param string $after Optional. Display after edit link. Default empty.
+ * @param int|WP_Term|null $term Optional. Term ID or object. If null, the queried object will be inspected. Default null.
+ * @param bool $echo Optional. Whether or not to echo the return. Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string|void HTML content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_null( $term ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_queried_object();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $term = get_term( $term );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $term ) {
</span></span></pre></div>
<a id="trunktestsphpunittestslinkeditTermLinkphp"></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/link/editTermLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/editTermLink.php (rev 0)
+++ trunk/tests/phpunit/tests/link/editTermLink.php 2021-11-16 14:55:04 UTC (rev 52180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,180 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group link
+ * @covers ::edit_term_link
+ */
+class Tests_Link_EditTermLink extends WP_UnitTestCase {
+
+ private static $terms;
+ private static $user_ids;
+
+ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+ self::register_custom_taxonomy();
+
+ $taxonomies = array( 'category', 'post_tag', 'custom_taxonomy' );
+ foreach ( $taxonomies as $taxonomy ) {
+ self::$terms[ $taxonomy ] = $factory->term->create_and_get( array( 'taxonomy' => $taxonomy ) );
+ }
+
+ self::$user_ids['admin'] = $factory->user->create( array( 'role' => 'administrator' ) );
+ self::$user_ids['subscriber'] = $factory->user->create( array( 'role' => 'subscriber' ) );
+ }
+
+ public function set_up() {
+ parent::set_up();
+ self::register_custom_taxonomy();
+ }
+
+ /**
+ * @dataProvider data_edit_term_link
+ *
+ * @ticket 50225
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ * @param string $expected Expected URL within admin of edit link.
+ */
+ public function test_edit_term_link_for_permitted_user( $taxonomy, $use_id, $expected ) {
+ wp_set_current_user( self::$user_ids['admin'] );
+ $term = $this->get_term( $taxonomy, $use_id );
+
+ // Term IDs are not known by the data provider so need to be replaced.
+ $expected = str_replace( '%ID%', $use_id ? $term : $term->term_id, $expected );
+ $expected = '"' . admin_url( $expected ) . '"';
+
+ $this->assertStringContainsString( $expected, edit_term_link( '', '', '', $term, false ) );
+ $this->assertStringContainsString( $expected, edit_term_link( '', '', '', get_term( $term, $taxonomy ), false ) );
+ }
+
+ /**
+ * @dataProvider data_edit_term_link
+ *
+ * @ticket 50225
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ */
+ public function test_edit_term_link_for_denied_user( $taxonomy, $use_id ) {
+ wp_set_current_user( self::$user_ids['subscriber'] );
+ $term = $this->get_term( $taxonomy, $use_id );
+
+ $this->assertNull( edit_term_link( '', '', '', $term, false ) );
+ $this->assertNull( edit_term_link( '', '', '', get_term( $term, $taxonomy ), false ) );
+ }
+
+ /**
+ * @dataProvider data_edit_term_link
+ *
+ * @ticket 50225
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ */
+ public function test_edit_term_link_filter_is_int_by_term_id( $taxonomy, $use_id ) {
+ wp_set_current_user( self::$user_ids['admin'] );
+ $term = $this->get_term( $taxonomy, $use_id );
+
+ add_filter(
+ 'edit_term_link',
+ function( $location, $term ) {
+ $this->assertIsInt( $term );
+ },
+ 10,
+ 2
+ );
+
+ edit_term_link( '', '', '', $term, false );
+ }
+
+ /**
+ * @dataProvider data_edit_term_link
+ *
+ * @ticket 50225
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ */
+ public function test_edit_term_link_filter_is_int_by_term_object( $taxonomy, $use_id ) {
+ wp_set_current_user( self::$user_ids['admin'] );
+ $term = $this->get_term( $taxonomy, $use_id );
+
+ add_filter(
+ 'edit_term_link',
+ function( $location, $term ) {
+ $this->assertIsInt( $term );
+ },
+ 10,
+ 2
+ );
+
+ edit_term_link( '', '', '', get_term( $term, $taxonomy ), false );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public function data_edit_term_link() {
+ return array(
+ 'category passing term_id' => array(
+ 'taxonomy' => 'category',
+ 'use_id' => false,
+ 'expected' => 'term.php?taxonomy=category&tag_ID=%ID%&post_type=post',
+ ),
+ 'category passing term object' => array(
+ 'taxonomy' => 'category',
+ 'use_id' => true,
+ 'expected' => 'term.php?taxonomy=category&tag_ID=%ID%&post_type=post',
+ ),
+ 'post_tag passing term_id' => array(
+ 'taxonomy' => 'post_tag',
+ 'use_id' => false,
+ 'expected' => 'term.php?taxonomy=post_tag&tag_ID=%ID%&post_type=post',
+ ),
+ 'post_tag passing term object' => array(
+ 'taxonomy' => 'post_tag',
+ 'use_id' => true,
+ 'expected' => 'term.php?taxonomy=post_tag&tag_ID=%ID%&post_type=post',
+ ),
+ 'a custom taxonomy passing term_id' => array(
+ 'taxonomy' => 'custom_taxonomy',
+ 'use_id' => false,
+ 'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
+ ),
+ 'a custom taxonomy passing term_id' => array(
+ 'taxonomy' => 'custom_taxonomy',
+ 'use_id' => true,
+ 'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
+ ),
+ );
+ }
+
+ /**
+ * Helper to register a custom taxonomy for use in tests.
+ *
+ * @since 5.9.0
+ */
+ private static function register_custom_taxonomy() {
+ register_taxonomy( 'custom_taxonomy', 'post' );
+ }
+
+ /**
+ * Helper to get the term for the given taxonomy.
+ *
+ * @since 5.9.0
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ * @return WP_Term|int If $use_id is true, term ID is returned; else instance of WP_Term.
+ */
+ private function get_term( $taxonomy, $use_id ) {
+ $term = self::$terms[ $taxonomy ];
+ if ( $use_id ) {
+ $term = $term->term_id;
+ }
+
+ return $term;
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/link/editTermLink.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><a id="trunktestsphpunittestslinkgetEditTermLinkphp"></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/link/getEditTermLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getEditTermLink.php (rev 0)
+++ trunk/tests/phpunit/tests/link/getEditTermLink.php 2021-11-16 14:55:04 UTC (rev 52180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,180 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group link
+ * @covers ::get_edit_term_link
+ */
+class Tests_Link_GetEditTermLink extends WP_UnitTestCase {
+
+ public static $terms;
+ public static $user_ids;
+
+ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+ self::register_custom_taxonomy();
+
+ $taxonomies = array( 'category', 'post_tag', 'custom_taxonomy' );
+ foreach ( $taxonomies as $taxonomy ) {
+ self::$terms[ $taxonomy ] = $factory->term->create_and_get( array( 'taxonomy' => $taxonomy ) );
+ }
+
+ self::$user_ids['admin'] = $factory->user->create( array( 'role' => 'administrator' ) );
+ self::$user_ids['subscriber'] = $factory->user->create( array( 'role' => 'subscriber' ) );
+ }
+
+ public function set_up() {
+ parent::set_up();
+ self::register_custom_taxonomy();
+ }
+
+ /**
+ * @dataProvider data_get_edit_term_link
+ *
+ * @ticket 50225
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ * @param string $expected Expected URL within admin of edit link.
+ */
+ public function test_get_edit_term_link_for_permitted_user( $taxonomy, $use_id, $expected ) {
+ wp_set_current_user( self::$user_ids['admin'] );
+ $term = $this->get_term( $taxonomy, $use_id );
+
+ // Term IDs are not known by the data provider so need to be replaced.
+ $expected = str_replace( '%ID%', $use_id ? $term : $term->term_id, $expected );
+ $expected = admin_url( $expected );
+
+ $this->assertSame( $expected, get_edit_term_link( $term, $taxonomy ) );
+ $this->assertSame( $expected, get_edit_term_link( get_term( $term, $taxonomy ), $taxonomy ) );
+ }
+
+ /**
+ * @dataProvider data_get_edit_term_link
+ *
+ * @ticket 50225
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ */
+ public function test_get_edit_term_link_for_denied_user( $taxonomy, $use_id ) {
+ wp_set_current_user( self::$user_ids['subscriber'] );
+ $term = $this->get_term( $taxonomy, $use_id );
+
+ $this->assertNull( get_edit_term_link( $term, $taxonomy ) );
+ $this->assertNull( get_edit_term_link( get_term( $term, $taxonomy ), $taxonomy ) );
+ }
+
+ /**
+ * @dataProvider data_get_edit_term_link
+ *
+ * @ticket 50225
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ */
+ public function test_get_edit_term_link_filter_is_int_by_term_id( $taxonomy, $use_id ) {
+ wp_set_current_user( self::$user_ids['admin'] );
+ $term = $this->get_term( $taxonomy, $use_id );
+
+ add_filter(
+ 'get_edit_term_link',
+ function( $location, $term ) {
+ $this->assertIsInt( $term );
+ },
+ 10,
+ 2
+ );
+
+ get_edit_term_link( $term, $taxonomy );
+ }
+
+ /**
+ * @dataProvider data_get_edit_term_link
+ *
+ * @ticket 50225
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ */
+ public function test_get_edit_term_link_filter_is_int_by_term_object( $taxonomy, $use_id ) {
+ wp_set_current_user( self::$user_ids['admin'] );
+ $term = $this->get_term( $taxonomy, $use_id );
+
+ add_filter(
+ 'get_edit_term_link',
+ function( $location, $term ) {
+ $this->assertIsInt( $term );
+ },
+ 10,
+ 2
+ );
+
+ get_edit_term_link( get_term( $term, $taxonomy ), $taxonomy );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public function data_get_edit_term_link() {
+ return array(
+ 'category passing term_id' => array(
+ 'taxonomy' => 'category',
+ 'use_id' => false,
+ 'expected' => 'term.php?taxonomy=category&tag_ID=%ID%&post_type=post',
+ ),
+ 'category passing term object' => array(
+ 'taxonomy' => 'category',
+ 'use_id' => true,
+ 'expected' => 'term.php?taxonomy=category&tag_ID=%ID%&post_type=post',
+ ),
+ 'post_tag passing term_id' => array(
+ 'taxonomy' => 'post_tag',
+ 'use_id' => false,
+ 'expected' => 'term.php?taxonomy=post_tag&tag_ID=%ID%&post_type=post',
+ ),
+ 'post_tag passing term object' => array(
+ 'taxonomy' => 'post_tag',
+ 'use_id' => true,
+ 'expected' => 'term.php?taxonomy=post_tag&tag_ID=%ID%&post_type=post',
+ ),
+ 'a custom taxonomy passing term_id' => array(
+ 'taxonomy' => 'custom_taxonomy',
+ 'use_id' => false,
+ 'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
+ ),
+ 'a custom taxonomy passing term_id' => array(
+ 'taxonomy' => 'custom_taxonomy',
+ 'use_id' => true,
+ 'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
+ ),
+ );
+ }
+
+ /**
+ * Helper to register a custom taxonomy for use in tests.
+ *
+ * @since 5.9.0
+ */
+ private static function register_custom_taxonomy() {
+ register_taxonomy( 'custom_taxonomy', 'post' );
+ }
+
+ /**
+ * Helper to get the term for the given taxonomy.
+ *
+ * @since 5.9.0
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ * @return WP_Term|int If $use_id is true, term ID is returned; else instance of WP_Term.
+ */
+ private function get_term( $taxonomy, $use_id ) {
+ $term = self::$terms[ $taxonomy ];
+ if ( $use_id ) {
+ $term = $term->term_id;
+ }
+
+ return $term;
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/link/getEditTermLink.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><a id="trunktestsphpunitteststermgetTermLinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/getTermLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTermLink.php 2021-11-16 14:17:26 UTC (rev 52179)
+++ trunk/tests/phpunit/tests/term/getTermLink.php 2021-11-16 14:55:04 UTC (rev 52180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,13 +2,24 @@
</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"> * @group taxonomy
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers ::get_term_link
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Term_GetTermLink extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static $terms;
+
+ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+ self::register_custom_taxonomy();
+
+ $taxonomies = array( 'category', 'post_tag', 'wptests_tax' );
+ foreach ( $taxonomies as $taxonomy ) {
+ self::$terms[ $taxonomy ] = $factory->term->create_and_get( array( 'taxonomy' => $taxonomy ) );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function set_up() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- register_taxonomy( 'wptests_tax', 'post' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::register_custom_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"> public function test_integer_should_be_interpreted_as_term_id() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,4 +218,112 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( '/foo/term2/', $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @dataProvider data_get_term_link
+ *
+ * @ticket 50225
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ */
+ public function test_get_term_link_filter_is_object_by_term_id( $taxonomy, $use_id ) {
+ $term = $this->get_term( $taxonomy, $use_id );
+
+ add_filter(
+ 'term_link',
+ function( $location, $term ) {
+ $this->assertInstanceOf( 'WP_Term', $term );
+ },
+ 10,
+ 2
+ );
+
+ get_term_link( $term, $taxonomy );
+ }
+
+ /**
+ * @dataProvider data_get_term_link
+ *
+ * @ticket 50225
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ */
+ public function test_get_term_link_filter_is_object_by_term_object( $taxonomy, $use_id ) {
+ $term = $this->get_term( $taxonomy, $use_id );
+
+ add_filter(
+ 'term_link',
+ function( $location, $term ) {
+ $this->assertInstanceOf( 'WP_Term', $term );
+ },
+ 10,
+ 2
+ );
+
+ get_term_link( get_term( $term, $taxonomy ), $taxonomy );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public function data_get_term_link() {
+ return array(
+ 'category passing term_id' => array(
+ 'taxonomy' => 'category',
+ 'use_id' => false,
+ ),
+ 'category passing term object' => array(
+ 'taxonomy' => 'category',
+ 'use_id' => true,
+ ),
+ 'post_tag passing term_id' => array(
+ 'taxonomy' => 'post_tag',
+ 'use_id' => false,
+ ),
+ 'post_tag passing term object' => array(
+ 'taxonomy' => 'post_tag',
+ 'use_id' => true,
+ ),
+ 'a custom taxonomy passing term_id' => array(
+ 'taxonomy' => 'wptests_tax',
+ 'use_id' => false,
+ ),
+ 'a custom taxonomy passing term_id' => array(
+ 'taxonomy' => 'wptests_tax',
+ 'use_id' => true,
+ 'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
+ ),
+ );
+ }
+
+ /**
+ * Helper to register a custom taxonomy for use in tests.
+ *
+ * @since 5.9.0
+ */
+ private static function register_custom_taxonomy() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ }
+
+ /**
+ * Helper to get the term for the given taxonomy.
+ *
+ * @since 5.9.0
+ *
+ * @param string $taxonomy Taxonomy been tested (used for index of term keys).
+ * @param bool $use_id When true, pass term ID. Else, pass term object.
+ * @return WP_Term|int If $use_id is true, term ID is returned; else instance of WP_Term.
+ */
+ private function get_term( $taxonomy, $use_id ) {
+ $term = self::$terms[ $taxonomy ];
+ if ( $use_id ) {
+ $term = $term->term_id;
+ }
+
+ return $term;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>