From 15f4ae8b112a69f56fceee4e48a1d9eb5c6bc165 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 23 May 2018 09:11:30 +0300 Subject: [PATCH] When creating first user, authorize against `admin.login`, not `site.login` --- admin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin.php b/admin.php index dd2273de..1449ad2f 100644 --- a/admin.php +++ b/admin.php @@ -249,7 +249,7 @@ class AdminPlugin extends Plugin unset($this->grav['user']); $this->grav['user'] = $user; $user->authenticated = true; - $user->authorized = $user->authorize('site.login'); + $user->authorized = $user->authorize('admin.login'); $messages = $this->grav['messages']; $messages->add($this->grav['language']->translate('PLUGIN_ADMIN.LOGIN_LOGGED_IN'), 'info'); @@ -457,6 +457,7 @@ class AdminPlugin extends Plugin $twig->twig_vars['base_url_relative_frontend'] = $twig->twig_vars['base_url_relative'] ?: '/'; $twig->twig_vars['admin_route'] = trim($this->admin_route, '/'); $twig->twig_vars['base_url_relative'] = $twig->twig_vars['base_url_simple'] . '/' . $twig->twig_vars['admin_route']; + $twig->twig_vars['current_url'] = rtrim($twig->twig_vars['base_url_relative'] . '/' . $this->template . '/' . $this->route, '/'); $theme_url = '/' . ltrim($this->grav['locator']->findResource('plugin://admin/themes/' . $this->theme, false), '/'); $twig->twig_vars['theme_url'] = $theme_url;