Revert some changes to HttpFetchException

diff --git a/app/Exceptions/HttpFetchException.php b/app/Exceptions/HttpFetchException.php
index c445896c01e13f87b1ad9cd7a7826bccbee6a0ff..4ad45d92a35a8449f35e8c8f8ee8db44ce17f4df 100644 (file)
--- a/app/Exceptions/HttpFetchException.php
+++ b/app/Exceptions/HttpFetchException.php
@@ -2,22 +2,8 @@
 
 namespace BookStack\Exceptions;
 
 
 namespace BookStack\Exceptions;
 

-class HttpFetchException extends PrettyException
-{
-    /**
-     * Construct exception within BookStack\Uploads\HttpFetcher.
-     */
-    public function __construct(string $message = '', int $code = 0, ?\Throwable $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-
-        if ($previous) {
-            $this->setDetails($previous->getMessage());
-        }
-    }
+use Exception;

 
 

-    public function getStatusCode(): int
-    {
-        return 500;
-    }
+class HttpFetchException extends Exception
+{

 }
 }

diff --git a/app/Uploads/UserAvatars.php b/app/Uploads/UserAvatars.php
index 1cad3465c785ac5d2c871c542e384dcd48f9d237..3cd37812acbd40f14aec23ae2bb1d386a49df693 100644 (file)
--- a/app/Uploads/UserAvatars.php
+++ b/app/Uploads/UserAvatars.php
@@ -33,7 +33,7 @@ class UserAvatars
             $avatar = $this->saveAvatarImage($user);
             $user->avatar()->associate($avatar);
             $user->save();
             $avatar = $this->saveAvatarImage($user);
             $user->avatar()->associate($avatar);
             $user->save();

-        } catch (HttpFetchException $e) {
+        } catch (Exception $e) {

             Log::error('Failed to save user avatar image', ['exception' => $e]);
         }
     }
             Log::error('Failed to save user avatar image', ['exception' => $e]);
         }
     }


@@ -48,7 +48,7 @@ class UserAvatars
             $avatar = $this->createAvatarImageFromData($user, $imageData, $extension);
             $user->avatar()->associate($avatar);
             $user->save();
             $avatar = $this->createAvatarImageFromData($user, $imageData, $extension);
             $user->avatar()->associate($avatar);
             $user->save();

-        } catch (HttpFetchException $e) {
+        } catch (Exception $e) {

             Log::error('Failed to save user avatar image', ['exception' => $e]);
         }
     }
             Log::error('Failed to save user avatar image', ['exception' => $e]);
         }
     }