Merge branch 'master' into release

Author: ssddanbrown

app/Http/Controllers/ImageController.php

@@ -65,8 +65,7 @@ public function uploadByType($type, Request $request)
     {
         $this->checkPermission('image-create-all');
         $this->validate($request, [
-            'file' => 'image|mimes:jpeg,gif,png',
-            'uploaded_to' => 'integer|exists:pages,id'
+            'file' => 'image|mimes:jpeg,gif,png'
         ]);
 
         $imageUpload = $request->file('file');

app/Http/Controllers/UserController.php

@@ -164,7 +164,9 @@ public function update(Request $request, $id)
 
         $user->save();
         session()->flash('success', 'User successfully updated');
-        return redirect('/settings/users');
+
+        $redirectUrl = userCan('users-manage') ? '/settings/users' : '/settings/users/' . $user->id;
+        return redirect($redirectUrl);
     }
 
     /**