Changeset 34663

Timestamp:

09/28/2015 03:33:12 PM (11 years ago)

Author:

johnbillion

Message:

Update get_the_post_thumbnail_url() so it returns false on failure, to bring it inline with wp_get_attachment_image_url(). Correct and introduce new tests.

Fixes #33070

Location:

trunk

Files:

• src/wp-includes/post-thumbnail-template.php (modified) (2 diffs)
• tests/phpunit/tests/post/thumbnails.php (modified) (2 diffs)

trunk/src/wp-includes/post-thumbnail-template.php

@@ -183 +183 @@
  */
 function get_the_post_thumbnail_url( $post = null, $size = 'post-thumbnail' ) {
-        $image = wp_get_attachment_image_url( get_post_thumbnail_id( $post ), $size );
-        return isset( $image ) ? $image : false;
+        $post_thumbnail_id = get_post_thumbnail_id( $post );
+        if ( ! $post_thumbnail_id ) {
+                return false;
+        }
+        return wp_get_attachment_image_url( $post_thumbnail_id, $size );
 }
 
@@ -196 +199 @@
  */
 function the_post_thumbnail_url( $size = 'post-thumbnail' ) {
-        echo get_the_post_thumbnail_url( null, $size );
-}
+        $url = get_the_post_thumbnail_url( null, $size );
+        if ( $url ) {
+                echo esc_url( $url );
+        }
+}

trunk/tests/phpunit/tests/post/thumbnails.php

@@ -120 +120 @@
          */
         function test_get_the_post_thumbnail_url() {
-                $this->assertEquals( '', get_the_post_thumbnail_url() );
-                $this->assertEquals( '', get_the_post_thumbnail_url( $this->post ) );
+                $this->assertFalse( has_post_thumbnail( $this->post ) );
+                $this->assertFalse( get_the_post_thumbnail_url() );
+                $this->assertFalse( get_the_post_thumbnail_url( $this->post ) );
 
                 set_post_thumbnail( $this->post, $this->attachment_id );
 
-                $this->assertEquals( '', get_the_post_thumbnail_url() );
+                $this->assertFalse( get_the_post_thumbnail_url() );
                 $this->assertEquals( wp_get_attachment_url( $this->attachment_id ), get_the_post_thumbnail_url( $this->post ) );
 
@@ -131 +132 @@
 
                 $this->assertEquals( wp_get_attachment_url( $this->attachment_id ), get_the_post_thumbnail_url() );
+        }
+
+        /**
+         * @ticket 33070
+         */
+        function test_get_the_post_thumbnail_url_with_invalid_post() {
+                $post = $this->factory->post->create_and_get();
+
+                set_post_thumbnail( $post, $this->attachment_id );
+
+                $this->assertNotFalse( get_the_post_thumbnail_url( $post->ID ) );
+
+                $deleted = wp_delete_post( $post->ID, true );
+                $this->assertNotEmpty( $deleted );
+
+                $this->assertFalse( get_the_post_thumbnail_url( $post->ID ) );
         }