Fixed user login / remember me triggering before admin gets initialized

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

View File

@@ -128,15 +128,18 @@ class Admin
*/
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->base = $base;
$this->location = $location;
$this->route = $route;
$this->uri = $this->grav['uri'];
$this->session = $this->grav['session'];
$this->user = $this->grav['user'];
$this->uri = $grav['uri'];
$this->session = $grav['session'];
$this->user = $grav['user'];
$this->permissions = [];
$language = $this->grav['language'];
$language = $grav['language'];
// Load utility class
if ($language->enabled()) {