Add missing rawurlencode() to Pico::getPageUrl()

Replace urldecode() in Pico::evaluateRequestUrl() with rawurldecode() See #272 for details, thanks @smcdougall for spotting!
10 years ago · 2ca711ad59
parent e144cce6b1
commit 2ca711ad59
1 changed files with 2 additions and 2 deletions
--- 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);
    }

    /**