Merge branch '5.5'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 14 Aug 2023 09:56:58 +0000 (11:56 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 14 Aug 2023 09:56:58 +0000 (11:56 +0200)
1  2 
ts/WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation.ts
ts/WoltLabSuite/Core/Ui/Dropdown/Simple.ts
wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dropdown/Simple.js
wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php
wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
wcfsetup/install/files/lib/system/option/LineBreakSeparatedTextOptionType.class.php

index 7041a7a5efc2952e810fd6e1ec733ac8dbb9c3a3,e414f312dc01f4468734cb28f81b94d2ab1de6cc..c5b5adc39185f79d9b36b6d624e0736bb8fe65d6
@@@ -129,9 -125,12 +129,12 @@@ class ImagickImageAdapter implements II
       */
      public function createThumbnail($maxWidth, $maxHeight, $preserveAspectRatio = true)
      {
+         $maxHeight = (int)$maxHeight;
+         $maxWidth = (int)$maxWidth;
          $thumbnail = clone $this->imagick;
  
 -        if ($thumbnail->getImageFormat() == 'GIF') {
 +        if (\in_array($thumbnail->getImageFormat(), self::$animatedFormats)) {
              $thumbnail = $thumbnail->coalesceImages();
  
              do {