summaryrefslogtreecommitdiffstats
path: root/3rdparty
diff options
context:
space:
mode:
authorAlessandro Cosentino <cosenal@gmail.com>2012-08-12 14:52:00 -0400
committerAlessandro Cosentino <cosenal@gmail.com>2012-08-12 14:52:00 -0400
commit8bf1873f43b67f4bc6d227639161b4fd001fcd54 (patch)
tree98b2298624cb9f655f10fc4e6f1602f75eaab28b /3rdparty
parent1029b44255c02c9a03ad2ed3812dff3da47103e0 (diff)
opml icon in opening page: you know, Sunday jobs :P
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/SimplePie/library/SimplePie/IRI.php42
1 files changed, 23 insertions, 19 deletions
diff --git a/3rdparty/SimplePie/library/SimplePie/IRI.php b/3rdparty/SimplePie/library/SimplePie/IRI.php
index 012866da6..ffe3c9d91 100644
--- a/3rdparty/SimplePie/library/SimplePie/IRI.php
+++ b/3rdparty/SimplePie/library/SimplePie/IRI.php
@@ -768,27 +768,31 @@ class SimplePie_IRI
*/
public function is_valid()
{
- $isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null;
- if ($this->ipath !== '' &&
- (
- $isauthority && (
- $this->ipath[0] !== '/' ||
- substr($this->ipath, 0, 2) === '//'
- ) ||
- (
- $this->scheme === null &&
- !$isauthority &&
- strpos($this->ipath, ':') !== false &&
- (strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
- )
- )
- )
- {
- return false;
- }
-
return true;
}
+// NOTE: this is temporary commented out to bypass issue #214: https://github.com/simplepie/simplepie/issues/214
+//
+// $isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null;
+// if ($this->ipath !== '' &&
+// (
+// $isauthority && (
+// $this->ipath[0] !== '/' ||
+// substr($this->ipath, 0, 2) === '//'
+// ) ||
+// (
+// $this->scheme === null &&
+// !$isauthority &&
+// strpos($this->ipath, ':') !== false &&
+// (strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
+// )
+// )
+// )
+// {
+// return false;
+// }
+//
+// return true;
+// }
/**
* Set the entire IRI. Returns true on success, false on failure (if there