mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-11 17:24:46 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1569

Browse Source
This commit is contained in:
Ryan Cramer
2022-05-20 09:57:13 -04:00
parent 761e83a5f3
commit c686a8e5ea
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wire/modules/Process/ProcessPageView.module
View File

@@ -338,7 +338,8 @@ class ProcessPageView extends Process {
* *
* - Updates given request path to remove pagination segment. * - Updates given request path to remove pagination segment.
* - Returns found pagination segment or blank if none. * - Returns found pagination segment or blank if none.
* - Redirects to non-slash version if pagination segment found with trailing slash. * - Redirects to non-slash version if: pagination segment found with trailing slash,
* no $page API var was present, or $page present but does not allow slash.
* *
* @param string $requestPath * @param string $requestPath
* @param string|null $pageNumPrefix * @param string|null $pageNumPrefix
@@ -360,12 +361,23 @@ class ProcessPageView extends Process {
if(substr($requestPath, -1 * strlen($pageNumSegment)) === $pageNumSegment) { if(substr($requestPath, -1 * strlen($pageNumSegment)) === $pageNumSegment) {
// remove pagination segment from request path // remove pagination segment from request path
$requestPath = substr($requestPath, 0, -1 * strlen($pageNumSegment)); $requestPath = substr($requestPath, 0, -1 * strlen($pageNumSegment));
$setPageNum = $pageNum; $setPageNum = (int) $pageNum;
// disallow specific "/page1" in URL as it is implied by the lack of pagination segment if($setPageNum === 1) {
if($setPageNum === 1) $this->redirect($config->urls->root . ltrim($requestPath, '/')); // disallow specific "/page1" in URL as it is implied by the lack of pagination segment
// enforce no trailing slashes for pagination numbers $this->redirect($config->urls->root . ltrim($requestPath, '/'));
if($slash) { } else if($slash) {
$this->redirect($config->urls->root . ltrim($requestPath, '/') . $pageNumSegment); // a trailing slash is present after the pageNum i.e. /page9/
$page = $this->wire()->page;
// a $page API var will be present if a 404 was manually thrown from a template file
// but it likely won't be present if we are leading to a path hook
if(!$page || !$page->id || !$page->template || !$page->template->allowPageNum) $page = null;
if($page && ((int) $page->template->slashPageNum) > -1) {
// $page API var present and trailing slash is okay
} else {
// no $page API var present or trailing slash on pageNum disallowed
// enforce no trailing slashes for pagination numbers
$this->redirect($config->urls->root . ltrim($requestPath, '/') . $pageNumSegment);
}
} }
$this->wire()->input->setPageNum($pageNum); $this->wire()->input->setPageNum($pageNum);