From 05bbdad540906f866e9f2a381890befe2ca928d0 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 10 Oct 2012 21:38:10 +0000 Subject: [PATCH] Fix fatal error in SimplePie. see #22158. git-svn-id: http://core.svn.wordpress.org/trunk@22169 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/SimplePie/Misc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-includes/SimplePie/Misc.php b/wp-includes/SimplePie/Misc.php index 8af6b75ec4..138a6f933d 100755 --- a/wp-includes/SimplePie/Misc.php +++ b/wp-includes/SimplePie/Misc.php @@ -80,7 +80,9 @@ class SimplePie_Misc public static function absolutize_url($relative, $base) { $iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative); - return $iri->get_uri(); + if ( $iri ) + return $iri->get_uri(); + return $relative; } /**