Completed
Pull Request — develop (#132)
by Tony
03:18
created
app/Http/Requests/UpdateUserRequest.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
         if ($this->input('update') == 'password') {
57 57
             $user_id = $this->input('user_id');
58 58
             $rules = ['password'              => 'required|min:5|max:255',
59
-                      'password_confirmation' => 'required|same:password',
59
+                        'password_confirmation' => 'required|same:password',
60 60
             ];
61 61
             if (!Auth::user()->isAdmin() || Auth::id() == $user_id) {
62 62
                 $rules['current_password'] = 'required|password:'.$user_id;
Please login to merge, or discard this patch.
app/Http/Controllers/SettingsController.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,8 @@
 block discarded – undo
76 76
         if ($type == 'settings-value') {
77 77
             Settings::set($key, Input::get('value'));
78 78
             return response('OK', 200);
79
-        } elseif ($type == 'settings-array') {
79
+        }
80
+        elseif ($type == 'settings-array') {
80 81
             $new = Input::get('value');
81 82
             $current = Settings::get($key);
82 83
 
Please login to merge, or discard this patch.