Dan Brown

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

...@@ -65,8 +65,7 @@ class ImageController extends Controller ...@@ -65,8 +65,7 @@ class ImageController extends Controller
65 { 65 {
66 $this->checkPermission('image-create-all'); 66 $this->checkPermission('image-create-all');
67 $this->validate($request, [ 67 $this->validate($request, [
68 - 'file' => 'image|mimes:jpeg,gif,png', 68 + 'file' => 'image|mimes:jpeg,gif,png'
69 - 'uploaded_to' => 'integer|exists:pages,id'
70 ]); 69 ]);
71 70
72 $imageUpload = $request->file('file'); 71 $imageUpload = $request->file('file');
......
...@@ -164,7 +164,9 @@ class UserController extends Controller ...@@ -164,7 +164,9 @@ class UserController extends Controller
164 164
165 $user->save(); 165 $user->save();
166 session()->flash('success', 'User successfully updated'); 166 session()->flash('success', 'User successfully updated');
167 - return redirect('/settings/users'); 167 +
168 + $redirectUrl = userCan('users-manage') ? '/settings/users' : '/settings/users/' . $user->id;
169 + return redirect($redirectUrl);
168 } 170 }
169 171
170 /** 172 /**
......