Changeset 25287

Timestamp:

09/06/2013 05:26:04 PM (11 years ago)

Author:

wonderboymusic

Message:

Allow is_tag() to accept term_id, slug, 'term_name or array of any. Many other is_*()` funcs already do this. Adds unit tests.

Props ramiy.
Fixes #18746.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (3 diffs)
• tests/phpunit/tests/query/conditionals.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -247 +247 @@
  * @uses $wp_query
  *
- * @param mixed $slug Optional. Tag slug or array of slugs.
+ * @param mixed $tag Optional. Tag ID, name, slug, or array of Tag IDs, names, and slugs.
  * @return bool
  */
-function is_tag( $slug = '' ) {
+function is_tag( $tag = '' ) {
     global $wp_query;
 
@@ -258 +258 @@
     }
 
-    return $wp_query->is_tag( $slug );
+    return $wp_query->is_tag( $tag );
 }
 
@@ -3239 +3239 @@
      * @since 3.1.0
      *
-     * @param mixed $slug Optional. Tag slug or array of slugs.
+     * @param mixed $tag Optional. Tag ID, name, slug, or array of Tag IDs, names, and slugs.
      * @return bool
      */
-    function is_tag( $slug = '' ) {
-        if ( !$this->is_tag )
+    function is_tag( $tag = '' ) {
+        if ( ! $this->is_tag )
             return false;
 
-        if ( empty( $slug ) )
+        if ( empty( $tag ) )
             return true;
 
         $tag_obj = $this->get_queried_object();
 
-        $slug = (array) $slug;
-
-        if ( in_array( $tag_obj->slug, $slug ) )
+        $tag = (array) $tag;
+
+        if ( in_array( $tag_obj->term_id, $tag ) )
+            return true;
+        elseif ( in_array( $tag_obj->name, $tag ) )
+            return true;
+        elseif ( in_array( $tag_obj->slug, $tag ) )
             return true;
 

trunk/tests/phpunit/tests/query/conditionals.php

@@ -429 +429 @@
     // 'tag/(.+?)/?$' => 'index.php?tag=$matches[1]',
     function test_tag() {
-        $this->factory->term->create( array( 'name' => 'tag-a', 'taxonomy' => 'post_tag' ) );
+        $term_id = $this->factory->term->create( array( 'name' => 'Tag Named A', 'slug' => 'tag-a', 'taxonomy' => 'post_tag' ) );
         $this->go_to('/tag/tag-a/');
         $this->assertQueryTrue('is_archive', 'is_tag');
+
+        $tag = get_term( $term_id, 'post_tag' );
+
+        $this->assertTrue( is_tag() );
+        $this->assertTrue( is_tag( $tag->name ) );
+        $this->assertTrue( is_tag( $tag->slug ) );
+        $this->assertTrue( is_tag( $tag->term_id ) );
+        $this->assertTrue( is_tag( array() ) );
+        $this->assertTrue( is_tag( array( $tag->name ) ) );
+        $this->assertTrue( is_tag( array( $tag->slug ) ) );
+        $this->assertTrue( is_tag( array( $tag->term_id ) ) );
     }