diff --git a/CHANGELOG.md b/CHANGELOG.md index 04b5f91b..b51521c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Controls for `list` field were not in sync between top and bottom 1. [](#bugfix) * Check if `$object->blueprints()` exists in `onAdminAfterSave` + * Fix admin login redirects for multisite setups # v1.8.1 ## 05/15/2018 diff --git a/classes/admin.php b/classes/admin.php index b3951ca9..ea6d101a 100644 --- a/classes/admin.php +++ b/classes/admin.php @@ -365,7 +365,7 @@ class Admin $userKey = isset($credentials['username']) ? (string)$credentials['username'] : ''; $ipKey = Uri::ip(); - $redirect = isset($post['redirect']) ? $post['redirect'] : $this->uri->route(); + $redirect = $this->base . $this->route; // Check if the current IP has been used in failed login attempts. $attempts = count($rateLimiter->getAttempts($ipKey, 'ip')); @@ -392,11 +392,9 @@ class Admin if ($user->authorized) { $event->defMessage('PLUGIN_ADMIN.LOGIN_LOGGED_IN', 'info'); - $event->defRedirect($redirect); + $event->defRedirect(isset($post['redirect']) ? $post['redirect'] : $redirect); } else { $this->session->redirect = $redirect; - - $event->defRedirect($this->uri->route()); } } else { if ($user->authorized) { @@ -406,7 +404,7 @@ class Admin } } - $event->defRedirect($this->uri->route()); + $event->defRedirect($redirect); $message = $event->getMessage(); if ($message) { diff --git a/themes/grav/templates/partials/dashboard-pages.html.twig b/themes/grav/templates/partials/dashboard-pages.html.twig index ccc2a210..e3adfe1f 100644 --- a/themes/grav/templates/partials/dashboard-pages.html.twig +++ b/themes/grav/templates/partials/dashboard-pages.html.twig @@ -1,7 +1,7 @@ {% if authorize(['admin.pages', 'admin.super']) %}
- {{ "PLUGIN_ADMIN.MANAGE_PAGES"|tu }} + {{ "PLUGIN_ADMIN.MANAGE_PAGES"|tu }}

{{ "PLUGIN_ADMIN.LATEST_PAGE_UPDATES"|tu }}

diff --git a/themes/grav/templates/partials/login.html.twig b/themes/grav/templates/partials/login.html.twig index c822e785..f9ac9a8d 100644 --- a/themes/grav/templates/partials/login.html.twig +++ b/themes/grav/templates/partials/login.html.twig @@ -15,7 +15,7 @@ {% block integration %}{% endblock %} - {% set redirect = redirect ?: uri.route(false) %} + {% set redirect = redirect ?: '/' ~ admin_route ~ '/' ~ admin.route %}