DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-05-02 14:41:10 -07:00
parent 0116fa9b95 a0afa9f2e8
commit 0472e3a3e5
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/SettingsController.php
View file

@ -192,8 +192,7 @@ class SettingsController extends Controller
$data['username'] = $user->username; $data['username'] = $user->username;
$data['first_name'] = $user->first_name; $data['first_name'] = $user->first_name;
$data['last_name'] = $user->last_name; $data['last_name'] = $user->last_name;
$data['password'] = $user->password; $data['password'] = $request->input('password');
$user->notify(new FirstAdminNotification($data)); $user->notify(new FirstAdminNotification($data));
/*Mail::send(['text' => 'emails.firstadmin'], $data, function ($m) use ($data) { /*Mail::send(['text' => 'emails.firstadmin'], $data, function ($m) use ($data) {