Changeset 27016 for trunk

Timestamp:

01/22/2014 10:30:36 PM (11 years ago)

Author:

wonderboymusic

Message:

Let is_attachment() accept an $attachment parameter, similar to is_page() and is_single(). Adds Unit Tests for all 3.

Props alex-ye for the initial patch.
Fixes #24257.

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

@@ -176 +176 @@
  * @uses $wp_query
  *
+ * @param mixed $attachment Attachment ID, title, slug, or array of such.
  * @return bool
  */
-function is_attachment() {
+function is_attachment( $attachment = '' ) {
     global $wp_query;
 
@@ -186 +187 @@
     }
 
-    return $wp_query->is_attachment();
+    return $wp_query->is_attachment( $attachment );
 }
 
@@ -3388 +3389 @@
      * @since 3.1.0
      *
+         * @param mixed $attachment Attachment ID, title, slug, or array of such.
      * @return bool
      */
-    function is_attachment() {
-        return (bool) $this->is_attachment;
+    function is_attachment( $attachment = '' ) {
+        if ( ! $this->is_attachment ) {
+            return false;
+        }
+
+        if ( empty( $attachment ) ) {
+            return true;
+        }
+
+        $attachment = (array) $attachment;
+
+        $post_obj = $this->get_queried_object();
+
+        if ( in_array( $post_obj->ID, $attachment ) ) {
+            return true;
+        } elseif ( in_array( $post_obj->post_title, $attachment ) ) {
+            return true;
+        } elseif ( in_array( $post_obj->post_name, $attachment ) ) {
+            return true;
+        }
+        return false;
     }
 

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

@@ -671 +671 @@
         $query->set( 'post_type', array( 'post', 'thearray' ) );
     }
+
+    function test_is_single() {
+        $post_id = $this->factory->post->create();
+        $this->go_to( "/?p=$post_id" );
+
+        $post = get_queried_object();
+
+        $this->assertTrue( is_single() );
+        $this->assertTrue( is_single( $post ) );
+        $this->assertTrue( is_single( $post->ID ) );
+        $this->assertTrue( is_single( $post->post_title ) );
+        $this->assertTrue( is_single( $post->post_name ) );
+    }
+
+    function test_is_page() {
+        $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
+        $this->go_to( "/?page_id=$post_id" );
+
+        $post = get_queried_object();
+
+        $this->assertTrue( is_page() );
+        $this->assertTrue( is_page( $post ) );
+        $this->assertTrue( is_page( $post->ID ) );
+        $this->assertTrue( is_page( $post->post_title ) );
+        $this->assertTrue( is_page( $post->post_name ) );
+    }
+
+    function test_is_attachment() {
+        $post_id = $this->factory->post->create( array( 'post_type' => 'attachment' ) );
+        $this->go_to( "/?attachment_id=$post_id" );
+
+        $post = get_queried_object();
+
+        $this->assertTrue( is_attachment() );
+        $this->assertTrue( is_attachment( $post ) );
+        $this->assertTrue( is_attachment( $post->ID ) );
+        $this->assertTrue( is_attachment( $post->post_title ) );
+        $this->assertTrue( is_attachment( $post->post_name ) );
+    }
 }