Merge remote-tracking branch 'origin/develop' into 2.0

# Conflicts: # app/controllers/admin/AssetsController.php
2015-07-24 15:56:10 -07:00
parent e4bee3d372 e455b2af6e
commit fbb55c14d6
2 changed files with 29 additions and 13 deletions
@@ -321,6 +321,11 @@ class UsersController extends AdminController
                $user->password = $password;
            }

+            // Do we want to update the user email?
+            if (!Config::get('app.lock_passwords')) {
+                $user->email		    = Input::get('email');
+            }
+
            // Get the current user groups
            $userGroups = $user->groups()->lists('group_id', 'group_id');