From 491f73e0cdb236aa862e7373175e4b8b4c16ea38 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 13 Mar 2016 15:37:46 +0000 Subject: [PATCH] Fixed bug causing permission error on save and fixed non-gallery image save --- app/Http/Controllers/ImageController.php | 3 +-- app/Http/Controllers/UserController.php | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php index 7820f6f91..f9d65c48b 100644 --- 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 9f6a4105f..d59931640 100644 --- 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); } /**