Merge branch 'release/3.2.5.1'

CHANGELOG-v3.md

@@ -1,5 +1,11 @@
 # Release Notes for Craft CMS 3.x
 
+## 3.2.5.1 - 2019-07-19
+
+### Fixed
+- Fixed an error that occurred if a plugin license key was set to an environment variable, which was set to an invalid key. ([#4604](https://github.com/craftcms/cms/issues/4604))
+- Fixed an error that prevented image thumbnails from generating in the Control Panel when using ImageMagick. ([#4609](https://github.com/craftcms/cms/issues/4609))
+
 ## 3.2.5 - 2019-07-19
 
 ### Added
@@ -12,7 +18,6 @@
 - Unsaved entry drafts now get assigned a new ID when they are fully saved, so they are treated as new elements. ([#4589](https://github.com/craftcms/cms/issues/4589))
 
 ### Fixed
-- Fixed a bug where each animated GIF frame would still be parsed when generating a thumbnail, even if the `transformGifs` setting was set to `false`. ([#4588](https://github.com/craftcms/cms/issues/4588))
 - Fixed some bugs with the “Save Entry” menu options, when editing an unsaved draft. ([#4614](https://github.com/craftcms/cms/issues/4614))
 - Fixed a bug where Craft could forget which site was being edited when updating an entry from a draft. ([#4615](https://github.com/craftcms/cms/issues/4615))
 

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "craftcms/cms",
   "description": "Craft CMS",
-  "version": "3.2.5",
+  "version": "3.2.5.1",
   "keywords": [
     "cms",
     "craftcms",

src/config/app.php

@@ -3,7 +3,7 @@
 return [
     'id' => 'CraftCMS',
     'name' => 'Craft CMS',
-    'version' => '3.2.5',
+    'version' => '3.2.5.1',
     'schemaVersion' => '3.2.15',
     'minVersionRequired' => '2.6.2788',
     'basePath' => dirname(__DIR__), // Defines the @app alias

src/controllers/AssetsController.php

@@ -950,10 +950,10 @@ public function actionPreviewFile(): Response
     /**
      * Handles an error when generating a thumb/transform.
      *
-     * @param \Exception $e The exception that was thrown
+     * @param \Throwable $e The exception that was thrown
      * @return Response
      */
-    private function _handleImageException(\Exception $e): Response
+    private function _handleImageException(\Throwable $e): Response
     {
         Craft::$app->getErrorHandler()->logException($e);
         $statusCode = $e instanceof HttpException && $e->statusCode ? $e->statusCode : 500;

src/image/Raster.php

@@ -608,8 +608,6 @@ public function writeText(string $text, int $x, int $y, int $angle = 0)
     public function disableAnimation()
     {
         $this->_isAnimatedGif = false;
-        $this->_image = $this->_image->layers()->get(0);
-
         return $this;
     }
 

src/services/Api.php

@@ -11,6 +11,7 @@
 use Composer\Semver\VersionParser;
 use Craft;
 use craft\enums\LicenseKeyStatus;
+use craft\errors\InvalidLicenseKeyException;
 use craft\errors\InvalidPluginException;
 use craft\helpers\App;
 use craft\helpers\ArrayHelper;
@@ -486,7 +487,12 @@ protected function headers(): array
         foreach ($pluginsService->getAllPluginInfo() as $pluginHandle => $pluginInfo) {
             if ($pluginInfo['isInstalled']) {
                 $headers['X-Craft-System'] .= ",plugin-{$pluginHandle}:{$pluginInfo['version']};{$pluginInfo['edition']}";
-                if (($licenseKey = $pluginsService->getPluginLicenseKey($pluginHandle)) !== null) {
+                try {
+                    $licenseKey = $pluginsService->getPluginLicenseKey($pluginHandle);
+                } catch (InvalidLicenseKeyException $e) {
+                    $licenseKey = null;
+                }
+                if ($licenseKey !== null) {
                     $pluginLicenses[] = "{$pluginHandle}:{$licenseKey}";
                 }
             }

src/services/Plugins.php

@@ -1107,6 +1107,7 @@ public function getPluginIconSvg(string $handle): string
      *
      * @param string $handle The plugin’s handle
      * @return string|null The plugin’s license key, or null if it isn’t known
+     * @throws InvalidLicenseKeyException
      */
     public function getPluginLicenseKey(string $handle)
     {