<!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" />
<title>[24903] branches/3.6: Improved XML handling for oEmbed.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24903">24903</a></dd>
<dt>Author</dt> <dd>mdawaffe</dd>
<dt>Date</dt> <dd>2013-07-30 22:00:21 +0000 (Tue, 30 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improved XML handling for oEmbed.
Merges <a href="http://core.trac.wordpress.org/changeset/24902">[24902]</a> to branches/3.6</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches36wpincludesclassoembedphp">branches/3.6/wp-includes/class-oembed.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches36">branches/3.6/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.6
</span><span class="cx">===================================================================
</span><del>--- branches/3.6 2013-07-30 21:57:27 UTC (rev 24902)
</del><ins>+++ branches/3.6 2013-07-30 22:00:21 UTC (rev 24903)
</ins><a id="branches36"></a>
<div class="propset"><h4>Property changes: branches/3.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,24855,24861,24866,24868,24872,24875,24883-24886,24892,24894-24895
</del><ins>+/trunk:18512,24855,24861,24866,24868,24872,24875,24883-24886,24892,24894-24895,24902
</ins><span class="cx">\ No newline at end of property
</span><a id="branches36wpincludesclassoembedphp"></a>
<div class="modfile"><h4>Modified: branches/3.6/wp-includes/class-oembed.php (24902 => 24903)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.6/wp-includes/class-oembed.php 2013-07-30 21:57:27 UTC (rev 24902)
+++ branches/3.6/wp-includes/class-oembed.php 2013-07-30 22:00:21 UTC (rev 24903)
</span><span class="lines">@@ -221,27 +221,52 @@
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><span class="cx"> function _parse_xml( $response_body ) {
</span><del>- if ( !function_exists('simplexml_load_string') ) {
- return false;
- }
</del><span class="cx"> if ( ! function_exists( 'libxml_disable_entity_loader' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $loader = libxml_disable_entity_loader( true );
</span><ins>+ $errors = libxml_use_internal_errors( true );
</ins><span class="cx">
</span><del>- $errors = libxml_use_internal_errors( true );
- $data = simplexml_load_string( $response_body );
</del><ins>+ $return = $this->_parse_xml_body( $response_body );
+
</ins><span class="cx"> libxml_use_internal_errors( $errors );
</span><ins>+ libxml_disable_entity_loader( $loader );
</ins><span class="cx">
</span><del>- $return = false;
- if ( is_object( $data ) ) {
- $return = new stdClass;
- foreach ( $data as $key => $value ) {
- $return->$key = (string) $value;
- }
</del><ins>+ return $return;
+ }
+
+ /**
+ * Helper function for parsing an XML response body.
+ *
+ * @since 3.6.0
+ * @access private
+ */
+ private function _parse_xml_body( $response_body ) {
+ if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument' ) )
+ return false;
+
+ $dom = new DOMDocument;
+ $success = $dom->loadXML( $response_body );
+ if ( ! $success )
+ return false;
+
+ if ( isset( $dom->doctype ) )
+ return false;
+
+ foreach ( $dom->childNodes as $child ) {
+ if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType )
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- libxml_disable_entity_loader( $loader );
</del><ins>+ $xml = simplexml_import_dom( $dom );
+ if ( ! $xml )
+ return false;
+
+ $return = new stdClass;
+ foreach ( $xml as $key => $value ) {
+ $return->$key = (string) $value;
+ }
+
</ins><span class="cx"> return $return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>