Ticket #33878: 33878_33070.diff

src/wp-includes/media.php

@@ -793 +793 @@
 }
 
 /**
+ * Get the URL of an image attachment.
+ *
+ * @since 4.4.0
+ *
+ * @param int          $attachment_id Image attachment ID.
+ * @param string|array $size          Optional. Registered image size to retrieve the source for or a flat
+ *                                    array of height and width dimensions. Default 'thumbnail'.
+ * @param bool         $icon          Optional. Whether the image should be treated as an icon. Default false.
+ * @return string|false Attachment URL or false if no image is available.
+ */
+function wp_get_attachment_image_url( $attachment_id, $size = 'thumbnail', $icon = false ) {
+        $image = wp_get_attachment_image_src( $attachment_id, $size, $icon );
+        return isset( $image['0'] ) ? $image['0'] : false;
+}
+
+/**
  * Adds a 'wp-post-image' class to post thumbnails. Internal use only.
  *
  * Uses the 'begin_fetch_post_thumbnail_html' and 'end_fetch_post_thumbnail_html' action hooks to

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

@@ -170 +170 @@
          */
         return apply_filters( 'post_thumbnail_html', $html, $post->ID, $post_thumbnail_id, $size, $attr );
 }
+
+/**
+ * Return the post thumbnail URL.
+ *
+ * @since 4.4.0
+ *
+ * @param int|WP_Post  $post Optional. Post ID or WP_Post object.  Default is global `$post`.
+ * @param string|array $size Optional. Registered image size to retrieve the source for or a flat
+ *                           array of height and width dimensions. Default 'post-thumbnail'.
+ * @return string Post thumbnail URL or empty string.
+ */
+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['0'] ) ? $image['0'] : '';
+}
+
+/**
+ * Display the post thumbnail URL.
+ *
+ * @since 4.4.0
+ *
+ * @param string|array $size Optional. Registered image size to retrieve the source for or a flat
+ *                           array of height and width dimensions. Default 'post-thumbnail'.
+ */
+function the_post_thumbnail_url( $size = 'post-thumbnail' ) {
+        echo get_the_post_thumbnail_url( null, $size );
+}

tests/phpunit/tests/media.php

@@ -718 +718 @@
 
                 remove_filter( 'embed_maybe_make_link', array( $this, 'filter_wp_embed_shortcode_custom' ), 10 );
         }
+
+        /**
+         * @ticket 33878
+         */
+        function test_wp_get_attachment_image_url() {
+                $this->assertFalse( wp_get_attachment_image_url( 0 ) );
+
+                $post_id = $this->factory->post->create();
+                $attachment_id = $this->factory->attachment->create_object( $this->img_name, $post_id, array(
+                        'post_mime_type' => 'image/jpeg',
+                        'post_type' => 'attachment',
+                ) );
+
+                $image = wp_get_attachment_image_src( $attachment_id, 'thumbnail', false );
+
+                $this->assertEquals( $image[0], wp_get_attachment_image_url( $attachment_id ) );
+        }
 }

tests/phpunit/tests/post/thumbnails.php

@@ -110 +110 @@
 
                 $this->assertEquals( $expected, $actual );
         }
+
+        /**
+         * @ticket 33070
+         */
+        function test_get_the_post_thumbnail_url() {
+                $this->assertEquals( '', get_the_post_thumbnail_url() );
+                $this->assertEquals( '', get_the_post_thumbnail_url( $this->post ) );
+
+                set_post_thumbnail( $this->post, $this->attachment_id );
+
+                $this->assertEquals( '', get_the_post_thumbnail_url() );
+                $this->assertEquals( wp_get_attachment_url( $this->attachment_id ), get_the_post_thumbnail_url( $this->post ) );
+
+                $GLOBALS['post'] = $this->post;
+
+                $this->assertEquals( wp_get_attachment_url( $this->attachment_id ), get_the_post_thumbnail_url() );
+        }
+
+        /**
+         * @ticket 33070
+         */
+        function test_the_post_thumbnail_url() {
+                $GLOBALS['post'] = $this->post;
+
+                ob_start();
+                the_post_thumbnail_url();
+                $actual = ob_get_clean();
+
+                $this->assertEmpty( $actual );
+
+                ob_start();
+                the_post_thumbnail_url();
+                $actual = ob_get_clean();
+
+                $this->assertEmpty( $actual );
+
+                set_post_thumbnail( $this->post, $this->attachment_id );
+
+                ob_start();
+                the_post_thumbnail_url();
+                $actual = ob_get_clean();
+
+                $this->assertEquals( wp_get_attachment_url( $this->attachment_id ), $actual );
+        }
 }