Strip URI parameters when static page is looked up, so it can be found. (#126)

* Strip URI parameters when static page is looked up, so it can be found.

* Introduce additional parameter char.

Co-authored-by: Hagai Bar-El <hagai.bar-el@arm.com>
Co-authored-by: hbarel <hbarel>
This commit is contained in:
hbarel 2021-06-06 20:41:26 +03:00 committed by GitHub
parent a056ec15cd
commit 9c9d9fb148
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3057,7 +3057,7 @@ foreach($select AS $select_value => $select_desc) {
// This behavior might change in future releases.
$this->error_404 = ($_SERVER['REDIRECT_STATUS'] == '404');
$pages = $this->fetchStaticPages(true, $nice_url);
$pages = $this->fetchStaticPages(true, strtok(strtok($nice_url,"&"), "?"));
if (is_array($pages)) {
foreach ($pages as $page) {
if ($page['permalink'] == $nice_url) {
@ -3069,7 +3069,7 @@ foreach($select AS $select_value => $select_desc) {
}
}
}
// Set static page to 404 error document if page not found
if ($this->error_404) {
$serendipity['GET']['subpage'] = $this->get404Errorpage();
@ -3082,7 +3082,7 @@ foreach($select AS $select_value => $select_desc) {
// Set static page according to requested URL
if (empty($serendipity['GET']['subpage'])) {
$serendipity['GET']['subpage'] = $nice_url;
$serendipity['GET']['subpage'] = strtok(strtok($nice_url,"&"), "?");
}
if ($this->selected()) {