fix

mariusconstantin2503 · mariusconstantin2503 · commit 4b6af77e8e9e · 2019-08-19T18:45:26.000+03:00
diff --git a/src/black-stubs/app/Http/Controllers/UserController.php b/src/black-stubs/app/Http/Controllers/UserController.php
@@ -69,11 +69,9 @@ public function update(UserRequest $request, User  $user)
     {
         $hasPassword = $request->get('password');
         $user->update(
-            $request->merge([
-                'picture' => $request->photo ? $request->photo->store('profile', 'public') : $user->picture,
-                'password' => Hash::make($request->get('password'))
-            ])->except([$hasPassword ? '' : 'password'])
-        );
+            $request->merge(['password' => Hash::make($request->get('password'))])
+                ->except([$hasPassword ? '' : 'password']
+        ));
 
         return redirect()->route('user.index')->withStatus(__('User successfully updated.'));
     }

Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,9 @@ public function update(UserRequest $request, User $user)`
`69`	`69`	`{`
`70`	`70`	`$hasPassword = $request->get('password');`
`71`	`71`	`$user->update(`
`72`		`- $request->merge([`
`73`		`- 'picture' => $request->photo ? $request->photo->store('profile', 'public') : $user->picture,`
`74`		`- 'password' => Hash::make($request->get('password'))`
`75`		`- ])->except([$hasPassword ? '' : 'password'])`
`76`		`- );`
	`72`	`+ $request->merge(['password' => Hash::make($request->get('password'))])`
	`73`	`+ ->except([$hasPassword ? '' : 'password']`
	`74`	`+ ));`
`77`	`75`
`78`	`76`	`return redirect()->route('user.index')->withStatus(__('User successfully updated.'));`
`79`	`77`	`}`