Wrapped all occurrences of DI::config()->get('system', 'maximagesize') with Strings...

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 990fb7e616b9f2cb968bf8adbb4477d7afba6732..967c58e2ab009530cc449d2d276a508835d16fb2 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -575,7 +575,7 @@ class Photo
                        $image->scaleToSquare(300);
 
                        $filesize = strlen($image->asString());
-                       $maximagesize = DI::config()->get('system', 'maximagesize');
+                       $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
                        if (!empty($maximagesize) && ($filesize > $maximagesize)) {
                                Logger::info('Avatar exceeds image limit', ['uid' => $uid, 'cid' => $cid, 'maximagesize' => $maximagesize, 'size' => $filesize, 'type' => $image->getType()]);
                                if ($image->getType() == 'image/gif') {
@@ -966,7 +966,7 @@ class Photo
                $width    = $image->getWidth();
                $height   = $image->getHeight();
 
-               $maximagesize = DI::config()->get('system', 'maximagesize');
+               $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
                if (!empty($maximagesize) && ($filesize > $maximagesize)) {
                        // Scale down to multiples of 640 until the maximum size isn't exceeded anymore