diff --git a/CHANGELOG.md b/CHANGELOG.md index a81868d7..a1bdbd52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.2.11 +## xx/xx/2017 + +1. [](#bugfix) + * Fixed issue `admin.super` or `admin.users` users changing the account when saving another user [#713](https://github.com/getgrav/grav-plugin-admin/issues/713) + # v1.2.10 ## 1/30/2017 diff --git a/classes/admincontroller.php b/classes/admincontroller.php index 1c1f5069..4f8358c9 100644 --- a/classes/admincontroller.php +++ b/classes/admincontroller.php @@ -556,7 +556,10 @@ class AdminController extends AdminBaseController $config->reload(); if ($this->view === 'user') { - $this->grav['user']->merge(User::load($this->admin->route)->toArray()); + if ($obj->username == $this->grav['user']->username) { + //Editing current user. Reload user object + $this->grav['user']->merge(User::load($this->admin->route)->toArray()); + } } }