Changeset 36646

Timestamp:

02/23/2016 08:06:25 PM (10 years ago)

Author:

boonebgorges

Message:

Make $taxonomy parameter optional in get_edit_term_link().

Props nicdford, sc0ttkclark.
Fixes #35922.

Location:

trunk

Files:

• src/wp-includes/link-template.php (modified) (1 diff)
• tests/phpunit/tests/term/getEditTermLink.php (modified) (1 diff)

trunk/src/wp-includes/link-template.php

@@ -908 +908 @@
  *
  * @since 3.1.0
+ * @since 4.5.0 The `$taxonomy` argument was made optional.
  *
  * @param int    $term_id     Term ID.
- * @param string $taxonomy    Taxonomy.
- * @param string $object_type The object type. Used to highlight the proper post type menu on the linked page.
+ * @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.
  * @return string|null The edit term link URL for the given term, or null on failure.
  */
-function get_edit_term_link( $term_id, $taxonomy, $object_type = '' ) {
-        $tax = get_taxonomy( $taxonomy );
-        if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) {
-                return;
-        }
-
+function get_edit_term_link( $term_id, $taxonomy = '', $object_type = '' ) {
         $term = get_term( $term_id, $taxonomy );
         if ( ! $term || is_wp_error( $term ) ) {
+                return;
+        }
+
+        $tax = get_taxonomy( $term->taxonomy );
+        if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) {
                 return;
         }

trunk/tests/phpunit/tests/term/getEditTermLink.php

@@ -51 +51 @@
         }
 
+        /**
+         * @ticket 35922
+         */
+        public function test_taxonomy_should_not_be_required() {
+                $t = self::factory()->term->create( array(
+                        'taxonomy' => 'wptests_tax',
+                        'name' => 'foo',
+                ) );
 
+                $actual = get_edit_term_link( $t );
+                $this->assertNotNull( $actual );
+        }
+
+        /**
+         * @ticket 35922
+         */
+        public function test_cap_check_should_use_correct_taxonomy_when_taxonomy_is_not_specified() {
+                register_taxonomy( 'wptests_tax_subscriber', 'post', array(
+                        'manage_terms' => 'read',
+                ) );
+
+                $t = self::factory()->term->create( array(
+                        'taxonomy' => 'wptests_tax',
+                        'name' => 'foo',
+                ) );
+
+                $u = self::factory()->user->create( array(
+                        'role' => 'subscriber',
+                ) );
+                wp_set_current_user( $u );
+
+                $actual = get_edit_term_link( $t );
+                $this->assertNull( $actual );
+        }
 }