<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13996] trunk/wp-includes/class-oembed.php:
Request XML from an oEmbed provider if the provider returns '
501 Not Implemented' for JSON.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13996">13996</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-04 12:30:22 +0000 (Sun, 04 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Request XML from an oEmbed provider if the provider returns '501 Not Implemented' for JSON. props nbachiyski, fixes <a href="http://trac.wordpress.org/ticket/11964">#11964</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassoembedphp">trunk/wp-includes/class-oembed.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassoembedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-oembed.php (13995 => 13996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-oembed.php 2010-04-04 12:20:19 UTC (rev 13995)
+++ trunk/wp-includes/class-oembed.php 2010-04-04 12:30:22 UTC (rev 13996)
</span><span class="lines">@@ -165,36 +165,63 @@
</span><span class="cx"> function fetch( $provider, $url, $args = '' ) {
</span><span class="cx"> $args = wp_parse_args( $args, wp_embed_defaults() );
</span><span class="cx">
</span><del>- $provider = add_query_arg( 'format', 'json', $provider ); // JSON is easier to deal with than XML
-
</del><span class="cx"> $provider = add_query_arg( 'maxwidth', $args['width'], $provider );
</span><span class="cx"> $provider = add_query_arg( 'maxheight', $args['height'], $provider );
</span><span class="cx"> $provider = add_query_arg( 'url', urlencode($url), $provider );
</span><ins>+
+ foreach( array( 'json', 'xml' ) as $format ) {
+ $result = $this->_fetch_with_format( $provider, $format );
+ if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() )
+ continue;
+ return ( $result && ! is_wp_error( $result ) ) ? $result : false;
+ }
+ return false;
+ }
</ins><span class="cx">
</span><del>- if ( !$result = wp_remote_retrieve_body( wp_remote_get( $provider ) ) )
</del><ins>+ /**
+ * Fetches result from an oEmbed provider for a specific format and complete provider URL
+ *
+ * @since 3.0.0
+ * @access private
+ * @param string $provider_url_with_args URL to the provider with full arguments list (url, maxheight, etc.)
+ * @param string $format Format to use
+ * @return bool|object False on failure, otherwise the result in the form of an object.
+ */
+ function _fetch_with_format( $provider_url_with_args, $format ) {
+ $provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args );
+ $response = wp_remote_get( $provider_url_with_args );
+ if ( 501 == wp_remote_retrieve_response_code( $response ) )
+ return new WP_Error( 'not-implemented' );
+ if ( ! $body = wp_remote_retrieve_body( $response ) )
</ins><span class="cx"> return false;
</span><ins>+ $parse_method = "_parse_$format";
+ return $this->$parse_method( $body );
+ }
</ins><span class="cx">
</span><del>- $result = trim( $result );
</del><ins>+ /**
+ * Parses a json response body.
+ *
+ * @since 3.0.0
+ * @access private
+ */
+ function _parse_json( $response_body ) {
+ return ( ( $data = json_decode( trim( $response_body ) ) ) && is_object( $data ) ) ? $data : false;
+ }
</ins><span class="cx">
</span><del>- // JSON?
- // Example content: http://vimeo.com/api/oembed.json?url=http%3A%2F%2Fvimeo.com%2F240975
- if ( $data = json_decode($result) ) {
- return $data;
- }
-
- // Must be XML. Only parse it if PHP5 is installed. (PHP4 isn't worth the trouble.)
- // Example content: http://vimeo.com/api/oembed.xml?url=http%3A%2F%2Fvimeo.com%2F240975
- elseif ( function_exists('simplexml_load_string') ) {
</del><ins>+ /**
+ * Parses an XML response body.
+ *
+ * @since 3.0.0
+ * @access private
+ */
+ function _parse_xml( $response_body ) {
+ if ( function_exists('simplexml_load_string') ) {
</ins><span class="cx"> $errors = libxml_use_internal_errors( 'true' );
</span><del>-
- $data = simplexml_load_string( $result );
-
</del><ins>+ $data = simplexml_load_string( $response_body );
</ins><span class="cx"> libxml_use_internal_errors( $errors );
</span><del>-
- if ( is_object($data) )
</del><ins>+ if ( is_object( $data ) )
</ins><span class="cx"> return $data;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>