webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-09 10:22:51 +03:00
Code Activity

Improved image upload error handling and fixed bad user-avatar rewriting

Browse Source
This commit is contained in:
Dan Brown
2016-01-17 15:19:26 +00:00
parent 0821672e70
commit bb87401d10
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Exceptions/ImageUploadException.php Normal file
View File

@@ -0,0 +1,6 @@
<?php namespace BookStack\Exceptions;
use Exception;
class ImageUploadException extends Exception {}

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

@@ -2,6 +2,7 @@
namespace BookStack\Http\Controllers;
use BookStack\Exceptions\ImageUploadException;
use BookStack\Repos\ImageRepo;
use Illuminate\Filesystem\Filesystem as File;
use Illuminate\Http\Request;
@@ -69,7 +70,13 @@ class ImageController extends Controller
]);
$imageUpload = $request->file('file');
$image = $this->imageRepo->saveNew($imageUpload, $type);
try {
$image = $this->imageRepo->saveNew($imageUpload, $type);
} catch (ImageUploadException $e) {
return response($e->getMessage(), 500);
}
return response()->json($image);
}