Skip to content

Fix of bug on the settings. #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 4, 2014
Merged

Fix of bug on the settings. #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11d5199
password wasn't hashed and sent to database fixed.
kolyaio Apr 4, 2014
8e7b7d3
add instructions to the installation.
kolyaio Apr 4, 2014
15946cf
changed the instruction of installation.
kolyaio Apr 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Tricks/Repositories/Eloquent/UserRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
Expand Down
5 changes: 3 additions & 2 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down