Changeset 35408

Timestamp:

10/27/2015 08:43:00 PM (9 years ago)

Author:

ocean90

Message:

Embeds: Replace hardcoded error messages with get_status_header_desc( $http_code ).

Fixes #34275.

Location:

trunk

Files:

• src/wp-includes/class-wp-oembed-controller.php (modified) (3 diffs)
• tests/phpunit/tests/oembed/controller.php (modified) (5 diffs)

trunk/src/wp-includes/class-wp-oembed-controller.php

@@ -33 +33 @@
         if ( false === $wp_query->get( 'url', false ) ) {
             status_header( 400 );
-            echo 'URL parameter missing';
+            return get_status_header_desc( 400 );
             exit;
         }
@@ -89 +89 @@
         if ( false === $data ) {
             status_header( 404 );
-            return __( 'Invalid URL.' );
+            return get_status_header_desc( 404 );
         }
 
@@ -118 +118 @@
         if ( ! $result || ! is_array( $data ) || empty( $data ) ) {
             status_header( 501 );
-            return 'Not implemented';
+            return get_status_header_desc( 501 );
         }
 

trunk/tests/phpunit/tests/oembed/controller.php

@@ -14 +14 @@
         $legacy_controller = new WP_oEmbed_Controller();
 
-        $this->assertEquals( 'Invalid URL.', $legacy_controller->dispatch( $request ) );
+        $this->assertEquals( get_status_header_desc( 404 ), $legacy_controller->dispatch( $request ) );
     }
 
@@ -28 +28 @@
         // WP_Query arguments.
         $request = array(
-            'url'     => get_permalink( $post->ID ),
+            'url'      => get_permalink( $post->ID ),
             'format'   => 'json',
             'maxwidth' => 400,
@@ -70 +70 @@
 
         $request = array(
-            'url'     => get_permalink( $post->ID ),
+            'url'      => get_permalink( $post->ID ),
             'format'   => 'json',
             'maxwidth' => 600,
@@ -93 +93 @@
 
         $request = array(
-            'url'     => get_permalink( $post->ID ),
+            'url'      => get_permalink( $post->ID ),
             'format'   => 'json',
             'maxwidth' => 600,
@@ -113 +113 @@
         $legacy_controller = new WP_oEmbed_Controller();
 
-        $this->assertEquals( 'Not implemented',  $legacy_controller->json_response( null, $request ) );
-        $this->assertEquals( 'Not implemented',  $legacy_controller->json_response( 123, $request ) );
-        $this->assertEquals( 'Not implemented',  $legacy_controller->json_response( array(), $request ) );
+        $this->assertEquals( get_status_header_desc( 501 ), $legacy_controller->json_response( null, $request ) );
+        $this->assertEquals( get_status_header_desc( 501 ), $legacy_controller->json_response( 123, $request ) );
+        $this->assertEquals( get_status_header_desc( 501 ), $legacy_controller->json_response( array(), $request ) );
     }