Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-06 05:28:35 +02:00
Code Issues Packages Projects Releases Activity

changed order to address redirect loop

Browse Source
This commit is contained in:
Andy Miller
2015-08-31 21:47:58 -06:00
parent dd00f34cb8
commit 9c3b062cff
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
system/src/Grav/Common/Uri.php
View File

@@ -79,11 +79,6 @@ class Uri
$config = $grav['config'];
$language = $grav['language'];
// If configured to, redirect trailing slash URI's with a 301 redirect
if ($config->get('system.pages.redirect_trailing_slash', false) && $this->url != '/' && Utils::endsWith($this->url, '/')) {
$grav->redirect(rtrim($this->url, '/'), 301);
}
// resets
$this->paths = [];
$this->params = [];
@@ -93,6 +88,11 @@ class Uri
// get any params and remove them
$uri = str_replace($this->root, '', $this->url);
// If configured to, redirect trailing slash URI's with a 301 redirect
if ($config->get('system.pages.redirect_trailing_slash', false) && $uri != '/' && Utils::endsWith($uri, '/')) {
$grav->redirect(rtrim($uri, '/'), 301);
}
// process params
$uri = $this->processParams($uri, $config->get('system.param_sep'));