SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

Force Pico::$requestUrl to have no leading/trailing slash

Browse Source 
Fixes #291
This commit is contained in:
Daniel Rudolf 2015-11-27 22:52:15 +01:00
parent 98022a5a8f
commit 698a249d45
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -26,6 +26,7 @@ Released: -
* [Fixed] #272: Encode URLs using `rawurlencode()` in `Pico::getPageUrl()` * [Fixed] #272: Encode URLs using `rawurlencode()` in `Pico::getPageUrl()`
* [Fixed] #274: Prevent double slashes in `base_url` * [Fixed] #274: Prevent double slashes in `base_url`
* [Fixed] #285: Make `index.php` work when installed as a composer dependency * [Fixed] #285: Make `index.php` work when installed as a composer dependency
* [Fixed] #291: Force `Pico::$requestUrl` to have no leading/trailing slash
``` ```
### Version 1.0.0-beta.1 ### Version 1.0.0-beta.1

7
lib/Pico.php
View File

@ -567,9 +567,9 @@ class Pico
* *
* We recommend you to use the `link` filter in templates to create * We recommend you to use the `link` filter in templates to create
* internal links, e.g. `{{ "sub/page"|link }}` is equivalent to * internal links, e.g. `{{ "sub/page"|link }}` is equivalent to
* `{{ base_url }}sub/page`. In content files you can still use the * `{{ base_url }}/sub/page` and `{{ base_url }}?sub/page`, depending on
* `%base_url%` variable; e.g. `%base_url%?sub/page` will be automatically * enabled URL rewriting. In content files you can use the `%base_url%`
* replaced accordingly. * variable; e.g. `%base_url%?sub/page` will be replaced accordingly.
* *
* @see Pico::getRequestUrl() * @see Pico::getRequestUrl()
* @return void * @return void
@ -587,6 +587,7 @@ class Pico
$pathComponent = substr($pathComponent, 0, $pathComponentLength); $pathComponent = substr($pathComponent, 0, $pathComponentLength);
} }
$this->requestUrl = (strpos($pathComponent, '=') === false) ? rawurldecode($pathComponent) : ''; $this->requestUrl = (strpos($pathComponent, '=') === false) ? rawurldecode($pathComponent) : '';
$this->requestUrl = trim($this->requestUrl, '/');
} }
/** /**