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

Use $grav['accounts'] instead of $grav['users']

Browse Source
This commit is contained in:
Matias Griese
2019-03-27 14:52:23 +02:00
parent 551a888573
commit f4c26b6715
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -3,6 +3,7 @@
1. [](#improved) 1. [](#improved)
* Improved the UI for the Parent Page Route dropdown when adding a new Page / Folder * Improved the UI for the Parent Page Route dropdown when adding a new Page / Folder
* Use `$grav['accounts']` instead of `$grav['users']`
1. [](#bugfix) 1. [](#bugfix)
* Fixed user edit links if Flex Objects plugin is installed but user isn't Flex User * Fixed user edit links if Flex Objects plugin is installed but user isn't Flex User
* Fixed deprecated `sameas()` Twig test * Fixed deprecated `sameas()` Twig test

2
admin.php
View File

@@ -300,7 +300,7 @@ class AdminPlugin extends Plugin
$data['access'] = ['admin' => ['login' => true, 'super' => true], 'site' => ['login' => true]]; $data['access'] = ['admin' => ['login' => true, 'super' => true], 'site' => ['login' => true]];
/** @var UserCollectionInterface $users */ /** @var UserCollectionInterface $users */
$users = $this->grav['users']; $users = $this->grav['accounts'];
// Create user object and save it // Create user object and save it
$user = $users->load($username); $user = $users->load($username);

4
classes/admin.php
View File

@@ -652,7 +652,7 @@ class Admin
$data[$type] = $obj; $data[$type] = $obj;
} elseif (preg_match('|users/|', $type)) { } elseif (preg_match('|users/|', $type)) {
/** @var UserCollectionInterface $users */ /** @var UserCollectionInterface $users */
$users = $this->grav['users']; $users = $this->grav['accounts'];
$obj = $users->load(preg_replace('|users/|', '', $type)); $obj = $users->load(preg_replace('|users/|', '', $type));
$obj->update($this->cleanUserPost($post)); $obj->update($this->cleanUserPost($post));
@@ -660,7 +660,7 @@ class Admin
$data[$type] = $obj; $data[$type] = $obj;
} elseif (preg_match('|user/|', $type)) { } elseif (preg_match('|user/|', $type)) {
/** @var UserCollectionInterface $users */ /** @var UserCollectionInterface $users */
$users = $this->grav['users']; $users = $this->grav['accounts'];
$obj = $users->load(preg_replace('|user/|', '', $type)); $obj = $users->load(preg_replace('|user/|', '', $type));
$obj->update($this->cleanUserPost($post)); $obj->update($this->cleanUserPost($post));

6
classes/admincontroller.php
View File

@@ -147,7 +147,7 @@ class AdminController extends AdminBaseController
if (isset($data['password'])) { if (isset($data['password'])) {
/** @var UserCollectionInterface $users */ /** @var UserCollectionInterface $users */
$users = $this->grav['users']; $users = $this->grav['accounts'];
$username = isset($data['username']) ? strip_tags(strtolower($data['username'])) : null; $username = isset($data['username']) ? strip_tags(strtolower($data['username'])) : null;
$user = $username ? $users->load($username) : null; $user = $username ? $users->load($username) : null;
@@ -217,7 +217,7 @@ class AdminController extends AdminBaseController
$login = $this->grav['login']; $login = $this->grav['login'];
/** @var UserCollectionInterface $users */ /** @var UserCollectionInterface $users */
$users = $this->grav['users']; $users = $this->grav['accounts'];
$username = isset($data['username']) ? strip_tags(strtolower($data['username'])) : ''; $username = isset($data['username']) ? strip_tags(strtolower($data['username'])) : '';
$user = !empty($username) ? $users->load($username) : null; $user = !empty($username) ? $users->load($username) : null;
@@ -685,7 +685,7 @@ class AdminController extends AdminBaseController
if ($this->view === 'user') { if ($this->view === 'user') {
if ($obj->username === $this->grav['user']->username) { if ($obj->username === $this->grav['user']->username) {
/** @var UserCollectionInterface $users */ /** @var UserCollectionInterface $users */
$users = $this->grav['users']; $users = $this->grav['accounts'];
//Editing current user. Reload user object //Editing current user. Reload user object
unset($this->grav['user']->avatar); unset($this->grav['user']->avatar);

2
classes/utils.php
View File

@@ -25,7 +25,7 @@ class Utils
$grav = Grav::instance(); $grav = Grav::instance();
/** @var UserCollectionInterface $users */ /** @var UserCollectionInterface $users */
$users = $grav['users']; $users = $grav['accounts'];
return $users->find($email, ['email']); return $users->find($email, ['email']);
} }