Fix for #184 where redirects had hardcoded /admin/ in them.

This commit is contained in:
Andy Miller
2015-09-18 10:07:49 -06:00
parent b638e26f88
commit 8055dfc8ba

View File

@@ -998,7 +998,8 @@ class AdminController
$obj->language($this->grav['session']->admin_lang);
}
}
$this->setRedirect(($multilang ? ('/' . $obj->language()) : '') . '/admin/' . $this->view . $obj->route());
$this->setRedirect('/' . ($multilang ? ($obj->language()) : '') . $this->grav['uri']->route());
}
return true;
@@ -1185,9 +1186,9 @@ class AdminController
$this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.SUCCESSFULLY_SWITCHED_LANGUAGE'), 'info');
$this->setRedirect('/' . $language .'/admin/' . $redirect);
$admin_route = $this->grav['config']->get('plugins.admin.route');
$this->setRedirect('/' . $language . $admin_route . '/' . $redirect);
return true;
}
/**