Changeset 35354

Timestamp:

10/22/2015 04:37:31 PM (11 years ago)

Author:

wonderboymusic

Message:

oEmbed: if SimpleXMLElement does not exist, return an HTTP Error 501 Not implemented response.

Props swissspidy.
Fixes #34274.

Location:

trunk

Files:

• src/wp-includes/class-wp-oembed-controller.php (modified) (2 diffs)
• src/wp-includes/embed-functions.php (modified) (1 diff)
• tests/phpunit/tests/oembed/controller.php (modified) (1 diff)

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

@@ -143 +143 @@
          */
         public function xml_response( $data ) {
+                if ( ! class_exists( 'SimpleXMLElement' ) ) {
+                        status_header( 501 );
+                        return get_status_header_desc( 501 );
+                }
+
                 $result = _oembed_create_xml( $data );
 
@@ -148 +153 @@
                 if ( ! $result ) {
                         status_header( 501 );
-                        return 'Not implemented';
+                        return get_status_header_desc( 501 );
                 }
 

trunk/src/wp-includes/embed-functions.php

@@ -352 +352 @@
         if ( is_singular() ) {
                 $output .= '<link rel="alternate" type="application/json+oembed" href="' . esc_url( get_oembed_endpoint_url( get_permalink() ) ) . '" />' . "\n";
-                $output .= '<link rel="alternate" type="text/xml+oembed" href="' . esc_url( get_oembed_endpoint_url( get_permalink(), 'xml' ) ) . '" />' . "\n";
+
+                if ( class_exists( 'SimpleXMLElement' ) ) {
+                        $output .= '<link rel="alternate" type="text/xml+oembed" href="' . esc_url( get_oembed_endpoint_url( get_permalink(), 'xml' ) ) . '" />' . "\n";
+                }
         }
 

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

@@ -165 +165 @@
                 $legacy_controller = new WP_oEmbed_Controller();
 
-                $this->assertEquals( 'Not implemented',  $legacy_controller->xml_response( null ) );
-                $this->assertEquals( 'Not implemented',  $legacy_controller->xml_response( 123 ) );
-                $this->assertEquals( 'Not implemented',  $legacy_controller->xml_response( array() ) );
+                $this->assertEquals( get_status_header_desc( 501 ),  $legacy_controller->xml_response( null ) );
+                $this->assertEquals( get_status_header_desc( 501 ),  $legacy_controller->xml_response( 123 ) );
+                $this->assertEquals( get_status_header_desc( 501 ),  $legacy_controller->xml_response( array() ) );
         }