Index: wp-includes/SimplePie/HTTP/Parser.php
===================================================================
--- wp-includes/SimplePie/HTTP/Parser.php	(revision 22356)
+++ wp-includes/SimplePie/HTTP/Parser.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Misc.php
===================================================================
--- wp-includes/SimplePie/Misc.php	(revision 22356)
+++ wp-includes/SimplePie/Misc.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
@@ -80,9 +80,11 @@
 	public static function absolutize_url($relative, $base)
 	{
 		$iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
-		if ( $iri )
-			return $iri->get_uri();
-		return $relative;
+		if ($iri === false)
+		{
+			return false;
+		}
+		return $iri->get_uri();
 	}
 
 	/**
Index: wp-includes/SimplePie/Parser.php
===================================================================
--- wp-includes/SimplePie/Parser.php	(revision 22356)
+++ wp-includes/SimplePie/Parser.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
@@ -278,8 +278,12 @@
 
 		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['base']))
 		{
-			$this->xml_base[] = $this->registry->call('Misc', 'absolutize_url', array($attribs[SIMPLEPIE_NAMESPACE_XML]['base'], end($this->xml_base)));
-			$this->xml_base_explicit[] = true;
+			$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;
+			}
 		}
 		else
 		{
Index: wp-includes/SimplePie/Caption.php
===================================================================
--- wp-includes/SimplePie/Caption.php	(revision 22356)
+++ wp-includes/SimplePie/Caption.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Item.php
===================================================================
--- wp-includes/SimplePie/Item.php	(revision 22356)
+++ wp-includes/SimplePie/Item.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Enclosure.php
===================================================================
--- wp-includes/SimplePie/Enclosure.php	(revision 22356)
+++ wp-includes/SimplePie/Enclosure.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Source.php
===================================================================
--- wp-includes/SimplePie/Source.php	(revision 22356)
+++ wp-includes/SimplePie/Source.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Net/IPv6.php
===================================================================
--- wp-includes/SimplePie/Net/IPv6.php	(revision 22356)
+++ wp-includes/SimplePie/Net/IPv6.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Registry.php
===================================================================
--- wp-includes/SimplePie/Registry.php	(revision 22356)
+++ wp-includes/SimplePie/Registry.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
@@ -203,6 +203,22 @@
 	{
 		$class = $this->get_class($type);
 
+		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;
+			}
+		}
+
 		$result = call_user_func_array(array($class, $method), $parameters);
 		return $result;
 	}
Index: wp-includes/SimplePie/Copyright.php
===================================================================
--- wp-includes/SimplePie/Copyright.php	(revision 22356)
+++ wp-includes/SimplePie/Copyright.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/XML/Declaration/Parser.php
===================================================================
--- wp-includes/SimplePie/XML/Declaration/Parser.php	(revision 22356)
+++ wp-includes/SimplePie/XML/Declaration/Parser.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/IRI.php
===================================================================
--- wp-includes/SimplePie/IRI.php	(revision 22356)
+++ wp-includes/SimplePie/IRI.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
@@ -390,8 +390,8 @@
 		}
 		else
 		{
-			trigger_error('This should never happen', E_USER_ERROR);
-			die;
+			// This can occur when a paragraph is accidentally parsed as a URI
+			return false;
 		}
 	}
 
@@ -824,6 +824,10 @@
 		else
 		{
 			$parsed = $this->parse_iri((string) $iri);
+			if (!$parsed)
+			{
+				return false;
+			}
 
 			$return = $this->set_scheme($parsed['scheme'])
 				&& $this->set_authority($parsed['authority'])
Index: wp-includes/SimplePie/Rating.php
===================================================================
--- wp-includes/SimplePie/Rating.php	(revision 22356)
+++ wp-includes/SimplePie/Rating.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Sanitize.php
===================================================================
--- wp-includes/SimplePie/Sanitize.php	(revision 22356)
+++ wp-includes/SimplePie/Sanitize.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
@@ -302,7 +302,7 @@
 						if ($img->hasAttribute('src'))
 						{
 							$image_url = call_user_func($this->cache_name_function, $img->getAttribute('src'));
-							$cache = $this->registry->call('Cache', 'create', array($this->cache_location, $image_url, 'spi'));
+							$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $image_url, 'spi'));
 
 							if ($cache->load())
 							{
@@ -356,7 +356,11 @@
 
 			if ($type & SIMPLEPIE_CONSTRUCT_IRI)
 			{
-				$data = $this->registry->call('Misc', 'absolutize_url', array($data, $base));
+				$absolute = $this->registry->call('Misc', 'absolutize_url', array($data, $base));
+				if ($absolute !== false)
+				{
+					$data = $absolute;
+				}
 			}
 
 			if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI))
@@ -412,7 +416,10 @@
 					if ($element->hasAttribute($attribute))
 					{
 						$value = $this->registry->call('Misc', 'absolutize_url', array($element->getAttribute($attribute), $this->base));
-						$element->setAttribute($attribute, $value);
+						if ($value !== false)
+						{
+							$element->setAttribute($attribute, $value);
+						}
 					}
 				}
 			}
Index: wp-includes/SimplePie/Core.php
===================================================================
--- wp-includes/SimplePie/Core.php	(revision 22356)
+++ wp-includes/SimplePie/Core.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Decode/HTML/Entities.php
===================================================================
--- wp-includes/SimplePie/Decode/HTML/Entities.php	(revision 22356)
+++ wp-includes/SimplePie/Decode/HTML/Entities.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Author.php
===================================================================
--- wp-includes/SimplePie/Author.php	(revision 22356)
+++ wp-includes/SimplePie/Author.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Locator.php
===================================================================
--- wp-includes/SimplePie/Locator.php	(revision 22356)
+++ wp-includes/SimplePie/Locator.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
@@ -72,11 +72,18 @@
 		$this->timeout = $timeout;
 		$this->max_checked_feeds = $max_checked_feeds;
 
-		$this->dom = new DOMDocument();
+		if (class_exists('DOMDocument'))
+		{
+			$this->dom = new DOMDocument();
 
-		set_error_handler(array('SimplePie_Misc', 'silence_errors'));
-		$this->dom->loadHTML($this->file->body);
-		restore_error_handler();
+			set_error_handler(array('SimplePie_Misc', 'silence_errors'));
+			$this->dom->loadHTML($this->file->body);
+			restore_error_handler();
+		}
+		else
+		{
+			$this->dom = null;
+		}
 	}
 
 	public function set_registry(SimplePie_Registry $registry)
@@ -162,6 +169,10 @@
 
 	public function get_base()
 	{
+		if ($this->dom === null)
+		{
+			throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+		}
 		$this->http_base = $this->file->url;
 		$this->base = $this->http_base;
 		$elements = $this->dom->getElementsByTagName('base');
@@ -169,7 +180,12 @@
 		{
 			if ($element->hasAttribute('href'))
 			{
-				$this->base = $this->registry->call('Misc', 'absolutize_url', array(trim($element->getAttribute('href')), $this->http_base));
+				$base = $this->registry->call('Misc', 'absolutize_url', array(trim($element->getAttribute('href')), $this->http_base));
+				if ($base === false)
+				{
+					continue;
+				}
+				$this->base = $base;
 				$this->base_location = method_exists($element, 'getLineNo') ? $element->getLineNo() : 0;
 				break;
 			}
@@ -196,6 +212,11 @@
 
 	protected function search_elements_by_tag($name, &$done, $feeds)
 	{
+		if ($this->dom === null)
+		{
+			throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+		}
+
 		$links = $this->dom->getElementsByTagName($name);
 		foreach ($links as $link)
 		{
@@ -216,6 +237,10 @@
 				{
 					$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
 				}
+				if ($href === false)
+				{
+					continue;
+				}
 
 				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]))
 				{
@@ -238,6 +263,11 @@
 
 	public function get_links()
 	{
+		if ($this->dom === null)
+		{
+			throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+		}
+
 		$links = $this->dom->getElementsByTagName('a');
 		foreach ($links as $link)
 		{
@@ -255,6 +285,10 @@
 					{
 						$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
 					}
+					if ($href === false)
+					{
+						continue;
+					}
 
 					$current = $this->registry->call('Misc', 'parse_url', array($this->file->url));
 
Index: wp-includes/SimplePie/Cache.php
===================================================================
--- wp-includes/SimplePie/Cache.php	(revision 22356)
+++ wp-includes/SimplePie/Cache.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
@@ -79,7 +79,7 @@
 	 * @param string $extension 'spi' or 'spc'
 	 * @return SimplePie_Cache_Base Type of object depends on scheme of `$location`
 	 */
-	public static function create($location, $filename, $extension)
+	public static function get_handler($location, $filename, $extension)
 	{
 		$type = explode(':', $location, 2);
 		$type = $type[0];
@@ -93,6 +93,17 @@
 	}
 
 	/**
+	 * 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);
+	}
+
+	/**
 	 * Register a handler
 	 *
 	 * @param string $type DSN type to register for
Index: wp-includes/SimplePie/Restriction.php
===================================================================
--- wp-includes/SimplePie/Restriction.php	(revision 22356)
+++ wp-includes/SimplePie/Restriction.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Credit.php
===================================================================
--- wp-includes/SimplePie/Credit.php	(revision 22356)
+++ wp-includes/SimplePie/Credit.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Cache/Base.php
===================================================================
--- wp-includes/SimplePie/Cache/Base.php	(revision 22356)
+++ wp-includes/SimplePie/Cache/Base.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Cache/File.php
===================================================================
--- wp-includes/SimplePie/Cache/File.php	(revision 22356)
+++ wp-includes/SimplePie/Cache/File.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Cache/Memcache.php
===================================================================
--- wp-includes/SimplePie/Cache/Memcache.php	(revision 22356)
+++ wp-includes/SimplePie/Cache/Memcache.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Cache/MySQL.php
===================================================================
--- wp-includes/SimplePie/Cache/MySQL.php	(revision 22356)
+++ wp-includes/SimplePie/Cache/MySQL.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Cache/DB.php
===================================================================
--- wp-includes/SimplePie/Cache/DB.php	(revision 22356)
+++ wp-includes/SimplePie/Cache/DB.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Category.php
===================================================================
--- wp-includes/SimplePie/Category.php	(revision 22356)
+++ wp-includes/SimplePie/Category.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/File.php
===================================================================
--- wp-includes/SimplePie/File.php	(revision 22356)
+++ wp-includes/SimplePie/File.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Parse/Date.php
===================================================================
--- wp-includes/SimplePie/Parse/Date.php	(revision 22356)
+++ wp-includes/SimplePie/Parse/Date.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/Content/Type/Sniffer.php
===================================================================
--- wp-includes/SimplePie/Content/Type/Sniffer.php	(revision 22356)
+++ wp-includes/SimplePie/Content/Type/Sniffer.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/SimplePie/gzdecode.php
===================================================================
--- wp-includes/SimplePie/gzdecode.php	(revision 22356)
+++ wp-includes/SimplePie/gzdecode.php	(working copy)
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
Index: wp-includes/class-simplepie.php
===================================================================
--- wp-includes/class-simplepie.php	(revision 22356)
+++ wp-includes/class-simplepie.php	(working copy)
@@ -93,7 +93,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
@@ -110,7 +110,7 @@
 /**
  * SimplePie Version
  */
-define('SIMPLEPIE_VERSION', '1.3');
+define('SIMPLEPIE_VERSION', '1.3.1');
 
 /**
  * SimplePie Build
@@ -696,7 +696,19 @@
 
 		if (func_num_args() > 0)
 		{
-			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 = 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();
+			}
 		}
 	}
 
@@ -1323,7 +1335,7 @@
 			// Decide whether to enable caching
 			if ($this->cache && $parsed_feed_url['scheme'] !== '')
 			{
-				$cache = $this->registry->call('Cache', 'create', array($this->cache_location, call_user_func($this->cache_name_function, $this->feed_url), 'spc'));
+				$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $this->feed_url), 'spc'));
 			}
 
 			// Fetch the data via SimplePie_File into $this->raw_data
@@ -1560,10 +1572,20 @@
 			{
 				// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
 				unset($file);
-				if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
+				try
 				{
-					$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__));
+					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()));
 					return false;
 				}
 				if ($cache)
@@ -1573,7 +1595,7 @@
 					{
 						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);
 					}
-					$cache = $this->registry->call('Cache', 'create', array($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc'));
+					$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc'));
 				}
 				$this->feed_url = $file->url;
 			}
@@ -2962,6 +2984,65 @@
 	}
 
 	/**
+	 * 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);
+	}
+
+	/**
 	 * Sorting callback for items
 	 *
 	 * @access private