From 2dada986452c8a403c3ca652e87fe3a440fe9bf5 Mon Sep 17 00:00:00 2001 From: brandonkelly Date: Thu, 28 Mar 2024 14:52:05 -0500 Subject: [PATCH] 3.8.3 - fixed #199 --- CHANGELOG.md | 4 ++++ src/console/controllers/ConvertController.php | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69453b8..dde59573 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Release Notes for CKEditor for Craft CMS +## 3.8.3 - 2024-03-28 + +- Fixed a bug where the `ckeditor/convert` command wasn’t checking for and removing the old `configFile` Redactor setting. ([#199](https://github.com/craftcms/ckeditor/issues/199)) + ## 3.8.2 - 2024-03-19 - Fixed a bug where the “Insert image” toolbar button wasn’t available when editing CKEditor configs. ([#195](https://github.com/craftcms/ckeditor/issues/195)) diff --git a/src/console/controllers/ConvertController.php b/src/console/controllers/ConvertController.php index 76063b8d..5a4f2be1 100644 --- a/src/console/controllers/ConvertController.php +++ b/src/console/controllers/ConvertController.php @@ -210,7 +210,7 @@ public function actionRedactor(): int $ckeConfig = $this->generateCkeConfig($configName, $redactorConfig, $ckeConfigs, $fieldSettingsByConfig); $this->stdout(PHP_EOL); } else { - $basename = ($field['settings']['redactorConfig'] ?? null) ?: 'Default.json'; + $basename = ($field['settings']['redactorConfig'] ?? $field['settings']['configFile'] ?? null) ?: 'Default.json'; if (!isset($configMap[$basename])) { $this->stdout(PHP_EOL . PHP_EOL); $configMap[$basename] = $this->resolveRedactorConfig($basename, $ckeConfigs, $fieldSettingsByConfig); @@ -230,6 +230,7 @@ public function actionRedactor(): int unset( $field['settings']['cleanupHtml'], + $field['settings']['configFile'], $field['settings']['configSelectionMode'], $field['settings']['manualConfig'], $field['settings']['redactorConfig'],