<!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>[22366] trunk/wp-includes: Update SimplePie to 1.3.1.</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, #logmsg > ol { margin-left: 0; 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/22366">22366</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-11-05 14:25:25 +0000 (Mon, 05 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update SimplePie to 1.3.1. Props rmccue, ocean90. fixes <a href="http://core.trac.wordpress.org/ticket/22321">#22321</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesSimplePieAuthorphp">trunk/wp-includes/SimplePie/Author.php</a></li>
<li><a href="#trunkwpincludesSimplePieCacheBasephp">trunk/wp-includes/SimplePie/Cache/Base.php</a></li>
<li><a href="#trunkwpincludesSimplePieCacheDBphp">trunk/wp-includes/SimplePie/Cache/DB.php</a></li>
<li><a href="#trunkwpincludesSimplePieCacheFilephp">trunk/wp-includes/SimplePie/Cache/File.php</a></li>
<li><a href="#trunkwpincludesSimplePieCacheMemcachephp">trunk/wp-includes/SimplePie/Cache/Memcache.php</a></li>
<li><a href="#trunkwpincludesSimplePieCacheMySQLphp">trunk/wp-includes/SimplePie/Cache/MySQL.php</a></li>
<li><a href="#trunkwpincludesSimplePieCachephp">trunk/wp-includes/SimplePie/Cache.php</a></li>
<li><a href="#trunkwpincludesSimplePieCaptionphp">trunk/wp-includes/SimplePie/Caption.php</a></li>
<li><a href="#trunkwpincludesSimplePieCategoryphp">trunk/wp-includes/SimplePie/Category.php</a></li>
<li><a href="#trunkwpincludesSimplePieContentTypeSnifferphp">trunk/wp-includes/SimplePie/Content/Type/Sniffer.php</a></li>
<li><a href="#trunkwpincludesSimplePieCopyrightphp">trunk/wp-includes/SimplePie/Copyright.php</a></li>
<li><a href="#trunkwpincludesSimplePieCorephp">trunk/wp-includes/SimplePie/Core.php</a></li>
<li><a href="#trunkwpincludesSimplePieCreditphp">trunk/wp-includes/SimplePie/Credit.php</a></li>
<li><a href="#trunkwpincludesSimplePieDecodeHTMLEntitiesphp">trunk/wp-includes/SimplePie/Decode/HTML/Entities.php</a></li>
<li><a href="#trunkwpincludesSimplePieEnclosurephp">trunk/wp-includes/SimplePie/Enclosure.php</a></li>
<li><a href="#trunkwpincludesSimplePieFilephp">trunk/wp-includes/SimplePie/File.php</a></li>
<li><a href="#trunkwpincludesSimplePieHTTPParserphp">trunk/wp-includes/SimplePie/HTTP/Parser.php</a></li>
<li><a href="#trunkwpincludesSimplePieIRIphp">trunk/wp-includes/SimplePie/IRI.php</a></li>
<li><a href="#trunkwpincludesSimplePieItemphp">trunk/wp-includes/SimplePie/Item.php</a></li>
<li><a href="#trunkwpincludesSimplePieLocatorphp">trunk/wp-includes/SimplePie/Locator.php</a></li>
<li><a href="#trunkwpincludesSimplePieMiscphp">trunk/wp-includes/SimplePie/Misc.php</a></li>
<li><a href="#trunkwpincludesSimplePieNetIPv6php">trunk/wp-includes/SimplePie/Net/IPv6.php</a></li>
<li><a href="#trunkwpincludesSimplePieParseDatephp">trunk/wp-includes/SimplePie/Parse/Date.php</a></li>
<li><a href="#trunkwpincludesSimplePieParserphp">trunk/wp-includes/SimplePie/Parser.php</a></li>
<li><a href="#trunkwpincludesSimplePieRatingphp">trunk/wp-includes/SimplePie/Rating.php</a></li>
<li><a href="#trunkwpincludesSimplePieRegistryphp">trunk/wp-includes/SimplePie/Registry.php</a></li>
<li><a href="#trunkwpincludesSimplePieRestrictionphp">trunk/wp-includes/SimplePie/Restriction.php</a></li>
<li><a href="#trunkwpincludesSimplePieSanitizephp">trunk/wp-includes/SimplePie/Sanitize.php</a></li>
<li><a href="#trunkwpincludesSimplePieSourcephp">trunk/wp-includes/SimplePie/Source.php</a></li>
<li><a href="#trunkwpincludesSimplePieXMLDeclarationParserphp">trunk/wp-includes/SimplePie/XML/Declaration/Parser.php</a></li>
<li><a href="#trunkwpincludesSimplePiegzdecodephp">trunk/wp-includes/SimplePie/gzdecode.php</a></li>
<li><a href="#trunkwpincludesclasssimplepiephp">trunk/wp-includes/class-simplepie.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesSimplePieAuthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Author.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Author.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Author.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieCacheBasephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Cache/Base.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Cache/Base.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Cache/Base.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieCacheDBphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Cache/DB.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Cache/DB.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Cache/DB.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieCacheFilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Cache/File.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Cache/File.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Cache/File.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieCacheMemcachephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Cache/Memcache.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Cache/Memcache.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Cache/Memcache.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieCacheMySQLphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Cache/MySQL.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Cache/MySQL.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Cache/MySQL.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieCachephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Cache.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Cache.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Cache.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> * @param string $extension 'spi' or 'spc'
</span><span class="cx"> * @return SimplePie_Cache_Base Type of object depends on scheme of `$location`
</span><span class="cx"> */
</span><del>- public static function create($location, $filename, $extension)
</del><ins>+ public static function get_handler($location, $filename, $extension)
</ins><span class="cx"> {
</span><span class="cx"> $type = explode(':', $location, 2);
</span><span class="cx"> $type = $type[0];
</span><span class="lines">@@ -93,6 +93,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Create a new SimplePie_Cache object
+ *
+ * @deprecated Use {@see get_handler} instead
+ */
+ public function create($location, $filename, $extension)
+ {
+ trigger_error('Cache::create() has been replaced with Cache::get_handler(). Switch to the registry system to use this.', E_USER_DEPRECATED);
+ return self::get_handler($location, $filename, $extension);
+ }
+
+ /**
</ins><span class="cx"> * Register a handler
</span><span class="cx"> *
</span><span class="cx"> * @param string $type DSN type to register for
</span></span></pre></div>
<a id="trunkwpincludesSimplePieCaptionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Caption.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Caption.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Caption.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieCategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Category.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Category.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Category.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieContentTypeSnifferphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Content/Type/Sniffer.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Content/Type/Sniffer.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Content/Type/Sniffer.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieCopyrightphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Copyright.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Copyright.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Copyright.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieCorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Core.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Core.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Core.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieCreditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Credit.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Credit.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Credit.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieDecodeHTMLEntitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Decode/HTML/Entities.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Decode/HTML/Entities.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Decode/HTML/Entities.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieEnclosurephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Enclosure.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Enclosure.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Enclosure.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieFilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/File.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/File.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/File.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieHTTPParserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/HTTP/Parser.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/HTTP/Parser.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/HTTP/Parser.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieIRIphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/IRI.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/IRI.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/IRI.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span><span class="lines">@@ -390,8 +390,8 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- trigger_error('This should never happen', E_USER_ERROR);
- die;
</del><ins>+ // This can occur when a paragraph is accidentally parsed as a URI
+ return false;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -824,6 +824,10 @@
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="cx"> $parsed = $this->parse_iri((string) $iri);
</span><ins>+ if (!$parsed)
+ {
+ return false;
+ }
</ins><span class="cx">
</span><span class="cx"> $return = $this->set_scheme($parsed['scheme'])
</span><span class="cx"> && $this->set_authority($parsed['authority'])
</span></span></pre></div>
<a id="trunkwpincludesSimplePieItemphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Item.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Item.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Item.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieLocatorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Locator.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Locator.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Locator.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span><span class="lines">@@ -72,11 +72,18 @@
</span><span class="cx"> $this->timeout = $timeout;
</span><span class="cx"> $this->max_checked_feeds = $max_checked_feeds;
</span><span class="cx">
</span><del>- $this->dom = new DOMDocument();
</del><ins>+ if (class_exists('DOMDocument'))
+ {
+ $this->dom = new DOMDocument();
</ins><span class="cx">
</span><del>- set_error_handler(array('SimplePie_Misc', 'silence_errors'));
- $this->dom->loadHTML($this->file->body);
- restore_error_handler();
</del><ins>+ set_error_handler(array('SimplePie_Misc', 'silence_errors'));
+ $this->dom->loadHTML($this->file->body);
+ restore_error_handler();
+ }
+ else
+ {
+ $this->dom = null;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function set_registry(SimplePie_Registry $registry)
</span><span class="lines">@@ -162,6 +169,10 @@
</span><span class="cx">
</span><span class="cx"> public function get_base()
</span><span class="cx"> {
</span><ins>+ if ($this->dom === null)
+ {
+ throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+ }
</ins><span class="cx"> $this->http_base = $this->file->url;
</span><span class="cx"> $this->base = $this->http_base;
</span><span class="cx"> $elements = $this->dom->getElementsByTagName('base');
</span><span class="lines">@@ -169,7 +180,12 @@
</span><span class="cx"> {
</span><span class="cx"> if ($element->hasAttribute('href'))
</span><span class="cx"> {
</span><del>- $this->base = $this->registry->call('Misc', 'absolutize_url', array(trim($element->getAttribute('href')), $this->http_base));
</del><ins>+ $base = $this->registry->call('Misc', 'absolutize_url', array(trim($element->getAttribute('href')), $this->http_base));
+ if ($base === false)
+ {
+ continue;
+ }
+ $this->base = $base;
</ins><span class="cx"> $this->base_location = method_exists($element, 'getLineNo') ? $element->getLineNo() : 0;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -196,6 +212,11 @@
</span><span class="cx">
</span><span class="cx"> protected function search_elements_by_tag($name, &$done, $feeds)
</span><span class="cx"> {
</span><ins>+ if ($this->dom === null)
+ {
+ throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+ }
+
</ins><span class="cx"> $links = $this->dom->getElementsByTagName($name);
</span><span class="cx"> foreach ($links as $link)
</span><span class="cx"> {
</span><span class="lines">@@ -216,6 +237,10 @@
</span><span class="cx"> {
</span><span class="cx"> $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
</span><span class="cx"> }
</span><ins>+ if ($href === false)
+ {
+ continue;
+ }
</ins><span class="cx">
</span><span class="cx"> if (!in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && !in_array('stylesheet', $rel) && $link->hasAttribute('type') && in_array(strtolower($this->registry->call('Misc', 'parse_mime', array($link->getAttribute('type')))), array('application/rss+xml', 'application/atom+xml'))) && !isset($feeds[$href]))
</span><span class="cx"> {
</span><span class="lines">@@ -238,6 +263,11 @@
</span><span class="cx">
</span><span class="cx"> public function get_links()
</span><span class="cx"> {
</span><ins>+ if ($this->dom === null)
+ {
+ throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+ }
+
</ins><span class="cx"> $links = $this->dom->getElementsByTagName('a');
</span><span class="cx"> foreach ($links as $link)
</span><span class="cx"> {
</span><span class="lines">@@ -255,6 +285,10 @@
</span><span class="cx"> {
</span><span class="cx"> $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
</span><span class="cx"> }
</span><ins>+ if ($href === false)
+ {
+ continue;
+ }
</ins><span class="cx">
</span><span class="cx"> $current = $this->registry->call('Misc', 'parse_url', array($this->file->url));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesSimplePieMiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Misc.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Misc.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Misc.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span><span class="lines">@@ -80,9 +80,11 @@
</span><span class="cx"> public static function absolutize_url($relative, $base)
</span><span class="cx"> {
</span><span class="cx"> $iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
</span><del>- if ( $iri )
- return $iri->get_uri();
- return $relative;
</del><ins>+ if ($iri === false)
+ {
+ return false;
+ }
+ return $iri->get_uri();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesSimplePieNetIPv6php"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Net/IPv6.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Net/IPv6.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Net/IPv6.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieParseDatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Parse/Date.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Parse/Date.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Parse/Date.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieParserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Parser.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Parser.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Parser.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span><span class="lines">@@ -278,8 +278,12 @@
</span><span class="cx">
</span><span class="cx"> if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['base']))
</span><span class="cx"> {
</span><del>- $this->xml_base[] = $this->registry->call('Misc', 'absolutize_url', array($attribs[SIMPLEPIE_NAMESPACE_XML]['base'], end($this->xml_base)));
- $this->xml_base_explicit[] = true;
</del><ins>+ $base = $this->registry->call('Misc', 'absolutize_url', array($attribs[SIMPLEPIE_NAMESPACE_XML]['base'], end($this->xml_base)));
+ if ($base !== false)
+ {
+ $this->xml_base[] = $base;
+ $this->xml_base_explicit[] = true;
+ }
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkwpincludesSimplePieRatingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Rating.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Rating.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Rating.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieRegistryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Registry.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Registry.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Registry.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span><span class="lines">@@ -203,6 +203,22 @@
</span><span class="cx"> {
</span><span class="cx"> $class = $this->get_class($type);
</span><span class="cx">
</span><ins>+ if (in_array($class, $this->legacy))
+ {
+ switch ($type)
+ {
+ case 'Cache':
+ // For backwards compatibility with old non-static
+ // Cache::create() methods
+ if ($method === 'get_handler')
+ {
+ $result = @call_user_func_array(array($class, 'create'), $parameters);
+ return $result;
+ }
+ break;
+ }
+ }
+
</ins><span class="cx"> $result = call_user_func_array(array($class, $method), $parameters);
</span><span class="cx"> return $result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesSimplePieRestrictionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Restriction.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Restriction.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Restriction.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieSanitizephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Sanitize.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Sanitize.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Sanitize.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> if ($img->hasAttribute('src'))
</span><span class="cx"> {
</span><span class="cx"> $image_url = call_user_func($this->cache_name_function, $img->getAttribute('src'));
</span><del>- $cache = $this->registry->call('Cache', 'create', array($this->cache_location, $image_url, 'spi'));
</del><ins>+ $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $image_url, 'spi'));
</ins><span class="cx">
</span><span class="cx"> if ($cache->load())
</span><span class="cx"> {
</span><span class="lines">@@ -356,7 +356,11 @@
</span><span class="cx">
</span><span class="cx"> if ($type & SIMPLEPIE_CONSTRUCT_IRI)
</span><span class="cx"> {
</span><del>- $data = $this->registry->call('Misc', 'absolutize_url', array($data, $base));
</del><ins>+ $absolute = $this->registry->call('Misc', 'absolutize_url', array($data, $base));
+ if ($absolute !== false)
+ {
+ $data = $absolute;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI))
</span><span class="lines">@@ -412,7 +416,10 @@
</span><span class="cx"> if ($element->hasAttribute($attribute))
</span><span class="cx"> {
</span><span class="cx"> $value = $this->registry->call('Misc', 'absolutize_url', array($element->getAttribute($attribute), $this->base));
</span><del>- $element->setAttribute($attribute, $value);
</del><ins>+ if ($value !== false)
+ {
+ $element->setAttribute($attribute, $value);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesSimplePieSourcephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/Source.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/Source.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/Source.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePieXMLDeclarationParserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/XML/Declaration/Parser.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/XML/Declaration/Parser.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/XML/Declaration/Parser.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesSimplePiegzdecodephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/SimplePie/gzdecode.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/SimplePie/gzdecode.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/SimplePie/gzdecode.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span></span></pre></div>
<a id="trunkwpincludesclasssimplepiephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-simplepie.php (22365 => 22366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-simplepie.php 2012-11-05 14:13:29 UTC (rev 22365)
+++ trunk/wp-includes/class-simplepie.php 2012-11-05 14:25:25 UTC (rev 22366)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> *
</span><span class="cx"> * @package SimplePie
</span><del>- * @version 1.3
</del><ins>+ * @version 1.3.1
</ins><span class="cx"> * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
</span><span class="cx"> * @author Ryan Parman
</span><span class="cx"> * @author Geoffrey Sneddon
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * SimplePie Version
</span><span class="cx"> */
</span><del>-define('SIMPLEPIE_VERSION', '1.3');
</del><ins>+define('SIMPLEPIE_VERSION', '1.3.1');
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * SimplePie Build
</span><span class="lines">@@ -696,7 +696,19 @@
</span><span class="cx">
</span><span class="cx"> if (func_num_args() > 0)
</span><span class="cx"> {
</span><del>- trigger_error('Passing parameters to the constructor is no longer supported. Please use set_feed_url(), set_cache_location(), and set_cache_location() directly.');
</del><ins>+ $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+ trigger_error('Passing parameters to the constructor is no longer supported. Please use set_feed_url(), set_cache_location(), and set_cache_location() directly.', $level);
+
+ $args = func_get_args();
+ switch (count($args)) {
+ case 3:
+ $this->set_cache_duration($args[2]);
+ case 2:
+ $this->set_cache_location($args[1]);
+ case 1:
+ $this->set_feed_url($args[0]);
+ $this->init();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1323,7 +1335,7 @@
</span><span class="cx"> // Decide whether to enable caching
</span><span class="cx"> if ($this->cache && $parsed_feed_url['scheme'] !== '')
</span><span class="cx"> {
</span><del>- $cache = $this->registry->call('Cache', 'create', array($this->cache_location, call_user_func($this->cache_name_function, $this->feed_url), 'spc'));
</del><ins>+ $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $this->feed_url), 'spc'));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Fetch the data via SimplePie_File into $this->raw_data
</span><span class="lines">@@ -1560,10 +1572,20 @@
</span><span class="cx"> {
</span><span class="cx"> // We need to unset this so that if SimplePie::set_file() has been called that object is untouched
</span><span class="cx"> unset($file);
</span><del>- if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
</del><ins>+ try
</ins><span class="cx"> {
</span><del>- $this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
- $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
</del><ins>+ if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
+ {
+ $this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
+ $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
+ return false;
+ }
+ }
+ catch (SimplePie_Exception $e)
+ {
+ // This is usually because DOMDocument doesn't exist
+ $this->error = $e->getMessage();
+ $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, $e->getFile(), $e->getLine()));
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> if ($cache)
</span><span class="lines">@@ -1573,7 +1595,7 @@
</span><span class="cx"> {
</span><span class="cx"> trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
</span><span class="cx"> }
</span><del>- $cache = $this->registry->call('Cache', 'create', array($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc'));
</del><ins>+ $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc'));
</ins><span class="cx"> }
</span><span class="cx"> $this->feed_url = $file->url;
</span><span class="cx"> }
</span><span class="lines">@@ -2962,6 +2984,65 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Set the favicon handler
+ *
+ * @deprecated Use your own favicon handling instead
+ */
+ public function set_favicon_handler($page = false, $qs = 'i')
+ {
+ $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+ trigger_error('Favicon handling has been removed, please use your own handling', $level);
+ return false;
+ }
+
+ /**
+ * Get the favicon for the current feed
+ *
+ * @deprecated Use your own favicon handling instead
+ */
+ public function get_favicon()
+ {
+ $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+ trigger_error('Favicon handling has been removed, please use your own handling', $level);
+
+ if (($url = $this->get_link()) !== null)
+ {
+ return 'http://g.etfv.co/' . urlencode($url);
+ }
+
+ return false;
+ }
+
+ /**
+ * Magic method handler
+ *
+ * @param string $method Method name
+ * @param array $args Arguments to the method
+ * @return mixed
+ */
+ public function __call($method, $args)
+ {
+ if (strpos($method, 'subscribe_') === 0)
+ {
+ $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+ trigger_error('subscribe_*() has been deprecated, implement the callback yourself', $level);
+ return '';
+ }
+ if ($method === 'enable_xml_dump')
+ {
+ $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+ trigger_error('enable_xml_dump() has been deprecated, use get_raw_data() instead', $level);
+ return false;
+ }
+
+ $class = get_class($this);
+ $trace = debug_backtrace();
+ $file = $trace[0]['file'];
+ $line = $trace[0]['line'];
+ trigger_error("Call to undefined method $class::$method() in $file on line $line", E_USER_ERROR);
+ }
+
+ /**
</ins><span class="cx"> * Sorting callback for items
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span></span></pre>
</div>
</div>
</body>
</html>