summaryrefslogtreecommitdiffstats
path: root/3rdparty/SimplePie/library/SimplePie/IRI.php
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/SimplePie/library/SimplePie/IRI.php')
-rw-r--r--3rdparty/SimplePie/library/SimplePie/IRI.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/3rdparty/SimplePie/library/SimplePie/IRI.php b/3rdparty/SimplePie/library/SimplePie/IRI.php
index 012866da6..d3198c04f 100644
--- a/3rdparty/SimplePie/library/SimplePie/IRI.php
+++ b/3rdparty/SimplePie/library/SimplePie/IRI.php
@@ -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 @@ class SimplePie_IRI
}
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 @@ class SimplePie_IRI
else
{
$parsed = $this->parse_iri((string) $iri);
+ if (!$parsed)
+ {
+ return false;
+ }
$return = $this->set_scheme($parsed['scheme'])
&& $this->set_authority($parsed['authority'])