From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 22 Jul 2021 13:16:44 +0000 (+0200)
Subject: Merge branch '5.4'
X-Git-Tag: 5.5.0_Alpha_1~518
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d1334930b8d81ddf88af20883b8b9b89e3ef2541;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.4'
---

d1334930b8d81ddf88af20883b8b9b89e3ef2541
diff --cc wcfsetup/install/files/lib/system/WCFSetup.class.php
index e058a09e0b,510d3a498d..594d512332
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@@ -1351,10 -1338,15 +1352,14 @@@ class WCFSetup extends WC
          $factory = new ACPSessionFactory();
          $factory->load();
  
+         $useImagick = ImagickImageAdapter::isSupported()
+             && ImagickImageAdapter::supportsAnimatedGIFs(ImagickImageAdapter::getVersion())
+             && ImagickImageAdapter::supportsWebp();
+ 
          SessionHandler::getInstance()->changeUser($admin);
 -        SessionHandler::getInstance()->register('masterPassword', 1);
          SessionHandler::getInstance()->register('__wcfSetup_developerMode', self::$developerMode);
          SessionHandler::getInstance()->register('__wcfSetup_directories', self::$directories);
-         SessionHandler::getInstance()->register('__wcfSetup_imagick', ImagickImageAdapter::isSupported());
+         SessionHandler::getInstance()->register('__wcfSetup_imagick', $useImagick);
          SessioNHandler::getInstance()->registerReauthentication();
          SessionHandler::getInstance()->update();