Fixed bug causing permission error on save and fixed non-gallery image save

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 7820f6f91fb402867a364638b75b0b2fe0a7fc76..f9d65c48b706aa8698fbdf17d4cce6c245605c0b 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -65,8 +65,7 @@ class ImageController extends Controller
     {
         $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');

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 9f6a4105f1656fc1d5db21c5f4883447a929c164..d599316409cda20a0a273e26f3f0ca5ebc4c4608 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -164,7 +164,9 @@ class UserController extends Controller
 
         $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);
     }
 
     /**