github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-02-19 18:54:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into release

Browse Source
This commit is contained in:
Dan Brown 2016-03-13 15:38:06 +00:00
commit 1fe933e4ea
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/ImageController.php
View File

@ -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');

4
app/Http/Controllers/UserController.php
View File

@ -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);
}
/**