Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-05-07 01:27:14 +02:00
Code Issues Packages Projects Releases Activity

Solve issue in redirect with adding a new page (and other situations)

Browse Source
This commit is contained in:
Flavio Copes
2015-08-20 19:55:33 +02:00
parent b50cbbc778
commit 5ad210029b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
classes/controller.php
View File

@@ -121,7 +121,6 @@ class AdminController
$this->redirect = '/' . ltrim($this->redirect, '/');
$multilang = (count($this->grav['config']->get('system.languages.supported', [])) > 1);
$redirect = '';
if ($multilang) {
// if base path does not already contain the lang code, add it
$langPrefix = '/' . $this->grav['session']->admin_lang;
@@ -131,12 +130,16 @@ class AdminController
// now the first 4 chars of base contain the lang code.
// if redirect path already contains the lang code, and is != than the base lang code, then use redirect path as-is
if (substr($base, 0, 4) != substr($this->redirect, 0, 4)) {
$languages_enabled = $this->grav['config']->get('system.languages.supported', []);
if (in_array(substr($this->redirect, 1, 2), $languages_enabled)) {
if (Utils::pathPrefixedByLangCode($base) &&
Utils::pathPrefixedByLangCode($this->redirect) &&
substr($base, 0, 4) != substr($this->redirect, 0, 4)) {
$redirect = $this->redirect;
} else {
if (!Utils::startsWith($this->redirect, $base)) {
$this->redirect = $base . $this->redirect;
}
}
} else {
if (!Utils::startsWith($this->redirect, $base)) {
$this->redirect = $base . $this->redirect;