Merge branch 'develop' into feature/integrate-with-admin-pro

This commit is contained in:
Flavio Copes
2015-11-01 14:03:10 +01:00
12 changed files with 2390 additions and 2323 deletions

View File

@@ -1014,8 +1014,10 @@ class AdminController
$obj->language($this->grav['session']->admin_lang);
}
}
$admin_route = $this->grav['config']->get('plugins.admin.route');
$redirect_url = '/' . ($multilang ? ($obj->language()) : '') . $admin_route . '/' . $this->view . $obj->route();
$this->setRedirect('/' . ($multilang ? ($obj->language()) : '') . $this->grav['uri']->route());
$this->setRedirect($redirect_url);
}
return true;