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

Fix for redirect after saving a page when multilang is not enabled

Browse Source
This commit is contained in:
Flavio Copes
2015-08-26 10:25:14 +02:00
parent 94a7b8f177
commit 4295a5daba
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
classes/controller.php
View File

@@ -119,7 +119,8 @@ class AdminController
$base = $this->admin->base;
$this->redirect = '/' . ltrim($this->redirect, '/');
$multilang = (count($this->grav['config']->get('system.languages.supported', [])) > 1);
$multilang = $this->isMultilang();
$redirect = '';
if ($multilang) {
// if base path does not already contain the lang code, add it
@@ -153,6 +154,15 @@ class AdminController
$this->grav->redirect($redirect, $this->redirectCode);
}
/**
* Return true if multilang is active
*
* @return bool True if multilang is active
*/
protected function isMultilang() {
return count($this->grav['config']->get('system.languages.supported', [])) > 1;
}
/**
* Handle login.
*
@@ -909,16 +919,20 @@ class AdminController
if (method_exists($obj, 'unsetRouteSlug')) {
$obj->unsetRouteSlug();
}
if (!$obj->language()) {
$obj->language($this->grav['session']->admin_lang);
$multilang = $this->isMultilang();
if ($multilang) {
if (!$obj->language()) {
$obj->language($this->grav['session']->admin_lang);
}
}
$this->setRedirect('/' . $obj->language(). '/admin/' . $this->view . $obj->route());
$this->setRedirect(($multilang ? ('/' . $obj->language()) : '') . '/admin/' . $this->view . $obj->route());
}
return true;
}
/**
* Continue to the new page.
*