Changeset 33022

Timestamp:

07/01/2015 12:53:05 PM (11 years ago)

Author:

boonebgorges

Message:

Don't allow $field param to be passed to get_term_link().

The new parameter creates inconsistencies in the signatures of the various
functions for fetching term links (get_term_feed_link(),
get_edit_term_link(), etc.).

Reverts [32553].

See #14156.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (2 diffs)
• tests/phpunit/tests/term/getTermLink.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -4438 +4438 @@
  *
  * @since 2.5.0
- * @since 4.3.0 Introduced `$field` argument.
  *
  * @global WP_Rewrite $wp_rewrite
@@ -4444 +4443 @@
  * @param object|int|string $term     The term object, ID, or slug whose link will be retrieved.
  * @param string            $taxonomy Optional. Taxonomy. Default empty.
- * @param string            $field    Optional. The term field that should be matched by the `$term` argument. Accepts
- *                                    any `$field` values accepted by `get_term_by()`: 'slug', 'name',
- *                                    'term_taxonomy_id', or 'id'. Default is 'slug', unless `$term` is an integer, in
- *                                    which case it's asssumed to be an ID.
  * @return string|WP_Error HTML link to taxonomy term archive on success, WP_Error if term does not exist.
  */
-function get_term_link( $term, $taxonomy = '', $field = null ) {
+function get_term_link( $term, $taxonomy = '' ) {
         global $wp_rewrite;
 
         if ( !is_object($term) ) {
-                if ( is_null( $field ) ) {
-                        $field = is_int( $term ) ? 'id' : 'slug';
-                }
-
-                $term = get_term_by( $field, $term, $taxonomy );
+                if ( is_int( $term ) ) {
+                        $term = get_term( $term, $taxonomy );
+                } else {
+                        $term = get_term_by( 'slug', $term, $taxonomy );
+                }
         }
 

trunk/tests/phpunit/tests/term/getTermLink.php

@@ -44 +44 @@
 
         public function test_numeric_string_should_be_interpreted_as_term_slug() {
-                $t1 = $this->factory->term->create( array(
-                        'taxonomy' => 'wptests_tax',
-                        'name' => 'foo',
-                ) );
-                $t2 = $this->factory->term->create( array(
-                        'taxonomy' => 'wptests_tax',
-                        'slug' => $t1,
-                ) );
-
-                $term = (string) $t1;
-
-                $actual = get_term_link( $term, 'wptests_tax', 'id' );
-                $this->assertContains( 'wptests_tax=foo', $actual );
-        }
-
-        /**
-         * @ticket 14156
-         */
-        public function test_should_match_field_by_name() {
-                $t = $this->factory->term->create( array(
-                        'taxonomy' => 'wptests_tax',
-                        'slug' => 'foo',
-                        'name' => 'Bar Term',
-                ) );
-
-                $actual = get_term_link( 'Bar Term', 'wptests_tax', 'name' );
-                $this->assertContains( 'wptests_tax=foo', $actual );
-        }
-
-        /**
-         * @ticket 14156
-         */
-        public function test_should_match_field_by_tt_id() {
-                $t = $this->factory->term->create( array(
-                        'taxonomy' => 'wptests_tax',
-                        'slug' => 'foo',
-                        'name' => 'Bar Term',
-                ) );
-
-                $actual = get_term_link( 'Bar Term', 'wptests_tax', 'name' );
-                $this->assertContains( 'wptests_tax=foo', $actual );
-        }
-
-        /**
-         * @ticket 14156
-         */
-        public function test_numeric_string_should_be_interpreted_as_term_id_if_id_field_is_specified() {
                 $t1 = $this->factory->term->create( array(
                         'taxonomy' => 'wptests_tax',