Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-12-24 01:10:42 +01:00
Code Issues Packages Projects Releases Activity

simplified redirect that was causing some issues

Browse Source
This commit is contained in:
Andy Miller
2015-08-19 16:54:48 -06:00
parent 7fcf239132
commit 8e814e30ad
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
classes/controller.php
View File

@@ -119,13 +119,21 @@ class AdminController
$base = $this->admin->base;
if ($base[3] !== '/') {
$base = '/' . $this->grav['session']->admin_lang . $base;
$this->redirect = '/' . ltrim($this->redirect, '/');
if (!Utils::startsWith($this->redirect, $base)) {
$this->redirect = $base . $this->redirect;
}
$path = trim(substr($this->redirect, 0, strlen($base)) == $base ? substr($this->redirect, strlen($base)) : $this->redirect, '/');
$this->grav->redirect($this->redirect, $this->redirectCode);
$this->grav->redirect($base . '/' . preg_replace('|/+|', '/', $path), $this->redirectCode);
// if ($base[3] !== '/') {
// $base = '/' . $this->grav['session']->admin_lang . $base;
// }
// $path = trim(substr($this->redirect, 0, strlen($base)) == $base ? substr($this->redirect, strlen($base)) : $this->redirect, '/');
// $this->grav->redirect($base . '/' . preg_replace('|/+|', '/', $path), $this->redirectCode);
}
/**