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

Fixed redirect when using full path on subfolder install

Browse Source
This commit is contained in:
Matias Griese
2019-07-01 20:18:42 +03:00
parent be946c16ac
commit 121469311d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
classes/plugin/Admin.php
View File

@@ -363,11 +363,15 @@ class Admin
return; return;
} }
$redirect = '/' . ltrim($redirect, '/'); $redirect = '/' . ltrim(preg_replace('`//+`', '/', $redirect), '/');
$base = $this->base; $base = $this->base;
$root = Grav::instance()['uri']->rootUrl();
if ($root === '/') {
$root = '';
}
// Check if we already have an admin path: /admin. // Check if we already have an admin path: /admin or /root/admin.
if (Utils::startsWith($redirect, $base)) { if (Utils::startsWith($redirect, $base, false) || Utils::startsWith($redirect, $root . $base, false)) {
$this->grav->redirect($redirect, $redirectCode); $this->grav->redirect($redirect, $redirectCode);
} }