From 2ca711ad59aef0762cf23d8fef7f68607cc174db Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 8 Nov 2015 03:12:18 +0100 Subject: [PATCH] Add missing rawurlencode() to Pico::getPageUrl() Replace urldecode() in Pico::evaluateRequestUrl() with rawurldecode() See #272 for details, thanks @smcdougall for spotting! --- lib/Pico.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Pico.php b/lib/Pico.php index 91a6c27..674d526 100644 --- a/lib/Pico.php +++ b/lib/Pico.php @@ -559,7 +559,7 @@ class Pico if (($pathComponentLength = strpos($pathComponent, '&')) !== false) { $pathComponent = substr($pathComponent, 0, $pathComponentLength); } - $this->requestUrl = (strpos($pathComponent, '=') === false) ? urldecode($pathComponent) : ''; + $this->requestUrl = (strpos($pathComponent, '=') === false) ? rawurldecode($pathComponent) : ''; } /** @@ -1187,7 +1187,7 @@ class Pico */ public function getPageUrl($page) { - return $this->getBaseUrl() . ((!$this->isUrlRewritingEnabled() && !empty($page)) ? '?' : '') . $page; + return $this->getBaseUrl() . ((!$this->isUrlRewritingEnabled() && !empty($page)) ? '?' : '') . rawurlencode($page); } /**