Changeset 31239

Timestamp:

01/18/2015 08:32:50 PM (12 years ago)

Author:

SergeyBiryukov

Message:

attachment_url_to_postid() should always return an integer.

props nathan_dawson, ashfame.
fixes #31044.

Location:

trunk

Files:

• src/wp-includes/media.php (modified) (2 diffs)
• tests/phpunit/tests/media.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -3296 +3296 @@
  *
  * @param string $url The URL to resolve.
- * @return int The found post ID.
+ * @return int The found post ID, or 0 on failure.
  */
 function attachment_url_to_postid( $url ) {
@@ -3313 +3313 @@
         );
         $post_id = $wpdb->get_var( $sql );
-        if ( ! empty( $post_id ) ) {
-                return (int) $post_id;
-        }
+
+        return (int) $post_id;
 }
 

trunk/tests/phpunit/tests/media.php

@@ -502 +502 @@
         }
 
+        /**
+         * @ticket 31044
+         */
+        function test_attachment_url_to_postid_with_empty_url() {
+                $post_id = attachment_url_to_postid( '' );
+                $this->assertInternalType( 'int', $post_id );
+                $this->assertEquals( 0, $post_id );
+        }
+
         function test_wp_check_filetype() {
                 $url = 'http://example.com/testFile.mp4?autoplay=true&otherstuff=false';