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

app/Exceptions/ImageUploadException.php

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

app/Http/Controllers/ImageController.php

@@ -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');
+
+        try {
             $image = $this->imageRepo->saveNew($imageUpload, $type);
+        } catch (ImageUploadException $e) {
+            return response($e->getMessage(), 500);
+        }
+
         return response()->json($image);
     }
 

resources/assets/js/directives.js

@@ -56,6 +56,7 @@ module.exports = function (ngApp) {
                 var usingIds = typeof scope.currentId !== 'undefined' || scope.currentId === 'false';
                 scope.image = scope.currentImage;
                 scope.value = scope.currentImage || '';
+                if (usingIds) scope.value = scope.currentId;
 
                 function setImage(imageModel, imageUrl) {
                     scope.image = imageUrl;