Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-03 20:05:53 +01:00
Code Issues Packages Projects Releases Activity

Fixed user login / remember me triggering before admin gets initialized

Browse Source
This commit is contained in:
Matias Griese
2018-11-21 12:25:20 +02:00
parent 78e073ac95
commit c069c1d69f
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
# v1.9.0-beta.7
## mm/dd/2018
1. [](#bugfix)
* Fixed user login / remember me triggering before admin gets initialized
# v1.9.0-beta.6 # v1.9.0-beta.6
## 11/12/2018 ## 11/12/2018

6
admin.php
View File

@@ -649,13 +649,9 @@ class AdminPlugin extends Plugin
$this->route = array_shift($array); $this->route = array_shift($array);
} }
// Initialize admin class. // Initialize admin class (also registers it to Grav services).
$this->admin = new Admin($this->grav, $this->admin_route, $this->template, $this->route); $this->admin = new Admin($this->grav, $this->admin_route, $this->template, $this->route);
// And store the class into DI container.
$this->grav['admin'] = $this->admin;
// Double check we have system.yaml, site.yaml etc // Double check we have system.yaml, site.yaml etc
$config_path = $this->grav['locator']->findResource('user://config'); $config_path = $this->grav['locator']->findResource('user://config');
foreach ($this->admin->configurations() as $config_file) { foreach ($this->admin->configurations() as $config_file) {

11
classes/admin.php
View File

@@ -128,15 +128,18 @@ class Admin
*/ */
public function __construct(Grav $grav, $base, $location, $route) public function __construct(Grav $grav, $base, $location, $route)
{ {
// Register admin to grav because of calling $grav['user'] requires it.
$grav['admin'] = $this;
$this->grav = $grav; $this->grav = $grav;
$this->base = $base; $this->base = $base;
$this->location = $location; $this->location = $location;
$this->route = $route; $this->route = $route;
$this->uri = $this->grav['uri']; $this->uri = $grav['uri'];
$this->session = $this->grav['session']; $this->session = $grav['session'];
$this->user = $this->grav['user']; $this->user = $grav['user'];
$this->permissions = []; $this->permissions = [];
$language = $this->grav['language']; $language = $grav['language'];
// Load utility class // Load utility class
if ($language->enabled()) { if ($language->enabled()) {