diff options
Diffstat (limited to '3rdparty/SimplePie/library/SimplePie/IRI.php')
| -rw-r--r-- | 3rdparty/SimplePie/library/SimplePie/IRI.php | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/3rdparty/SimplePie/library/SimplePie/IRI.php b/3rdparty/SimplePie/library/SimplePie/IRI.php index ffe3c9d91..012866da6 100644 --- a/3rdparty/SimplePie/library/SimplePie/IRI.php +++ b/3rdparty/SimplePie/library/SimplePie/IRI.php @@ -768,31 +768,27 @@ 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 |