Merge pull request #41 from nick2il/master

Fix of bug on the settings.
CodepadME · Apr 4, 2014 · 1531415 · 1531415
2 parents 8988538 + 15946cf
commit 1531415
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/Tricks/Repositories/Eloquent/UserRepository.php b/app/Tricks/Repositories/Eloquent/UserRepository.php
@@ -149,7 +149,7 @@ protected function usernameIsAllowed($username)
     public function updateSettings(User $user, array $data)
     {
         $user->username = $data['username'];
-        $user->password = ($data['password'] != '') ? $data['password'] : $user->password;
+        $user->password = ($data['password'] != '') ? Hash::make($data['password']) : $user->password;
 
         if ($data['avatar'] != '') {
             File::move(public_path().'/img/avatar/temp/'.$data['avatar'], 'img/avatar/'.$data['avatar']);

diff --git a/readme.md b/readme.md
@@ -63,8 +63,9 @@ After this simple configuration you can populate the database by running a coupl
 
 CD into the directory of this project and run the following two commands:
 
-1. `php artisan migrate`
-2. `php artisan db:seed`
+1. `composer install`
+2. `php artisan migrate`
+3. `php artisan db:seed`
 
 This will create the database structure and populate the database with some sample data so that you could see this project in action.