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

# Conflicts: # app/controllers/admin/UsersController.php
2015-06-15 11:30:40 -07:00
parent d0189fb076 7820efc121
commit c4375f9fbc
1 changed files with 3 additions and 3 deletions
@@ -645,13 +645,13 @@ class UsersController extends AdminController

 							DB::table('users')->insert($newuser);

-							$udpateuser = Sentry::findUserByLogin($row[2]);
+							$updateuser = Sentry::findUserByLogin($row[2]);

 						    // Update the user details
-						    $udpateuser->password = $pass;
+						    $updateuser->password = $pass;

 						    // Update the user
-						    $udpateuser->save();
+						    $updateuser->save();


 							if (Input::get('email_user')==1) {