mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-25 15:51:37 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#843

Browse Source
This commit is contained in:
Ryan Cramer
2019-04-08 06:12:24 -04:00
parent 357ce2d642
commit da73398da1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,7 @@ class ProcessPageView extends Process {
if(empty($this->dirtyURL) && !empty($_SERVER['QUERY_STRING'])) $this->dirtyURL = '?' . $_SERVER['QUERY_STRING']; if(empty($this->dirtyURL) && !empty($_SERVER['QUERY_STRING'])) $this->dirtyURL = '?' . $_SERVER['QUERY_STRING'];
// check if there is an 'it' GET variable present in the request URL query string, which we don't want here // check if there is an 'it' GET variable present in the request URL query string, which we don't want here
if(isset($_GET['it']) && strpos($this->dirtyURL, '?it=') !== false || strpos($this->dirtyURL, '&it=')) { if(isset($_GET['it']) && (strpos($this->dirtyURL, '?it=') !== false || strpos($this->dirtyURL, '&it='))) {
// force to use path in request url rather than contents of 'it' var // force to use path in request url rather than contents of 'it' var
list($it,) = explode('?', $this->dirtyURL); list($it,) = explode('?', $this->dirtyURL);
$rootURL = $this->wire('config')->urls->root; $rootURL = $this->wire('config')->urls->root;
@@ -344,7 +344,7 @@ class ProcessPageView extends Process {
$indexRedirect = true; $indexRedirect = true;
} else if(strpos($this->dirtyURL, 'index.php') !== false && strpos($it, 'index.php') === false) { } else if(strpos($this->dirtyURL, 'index.php') !== false && strpos($it, 'index.php') === false) {
// if request contains index.php and the $it string does not, make it redirect to correct version // if request contains index.php and the $it string does not, make it redirect to correct version
$forceRedirect = true; if(preg_match('!/index\.php$!', parse_url($this->dirtyURL, PHP_URL_PATH))) $forceRedirect = true;
} }
$numParts = substr_count($it, '/'); $numParts = substr_count($it, '/');