Only update email if password locking isn't set to true

Author: snipe

app/controllers/admin/UsersController.php

@@ -287,7 +287,6 @@ public function postEdit($id = null)
             $user->first_name  		= Input::get('first_name');
             $user->last_name   		= Input::get('last_name');
             $user->employee_num		= Input::get('employee_num');
-            $user->email		    = Input::get('email');
             $user->activated   		= Input::get('activated', $user->activated);
             $user->permissions 		= Input::get('permissions');
             $user->jobtitle 		= Input::get('jobtitle');
@@ -310,6 +309,11 @@ public function postEdit($id = null)
                 $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');