give a default value to redactor config

ryssbowh · Jan 11, 2022 · 49d0731 · 49d0731
1 parent b5efd9d
commit 49d0731
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Web Puzzlers Emails Changelog
 
+## 1.2.2 - 2022-01-11
+
+### Fixed
+- Error when redactor config is not populated
+- Redactor config defaults to 'Default.json'
+
 ## 1.2.1 - 2022-01-11
 
 ### Fixed

diff --git a/src/behaviors/MessageBehavior.php b/src/behaviors/MessageBehavior.php
@@ -36,7 +36,7 @@ public function getParsedBody()
         return \Craft::$app->elements->parseRefs($this->owner->body);
     }
 
-    public function redactorInput(string $redactorConfig)
+    public function redactorInput(?string $redactorConfig)
     {
         \Craft::$app->view->registerAssetBundle(FieldAsset::class);
         RedactorAsset::registerTranslations(\Craft::$app->view);

diff --git a/src/helpers/RedactorHelper.php b/src/helpers/RedactorHelper.php
@@ -16,10 +16,11 @@ class RedactorHelper
 {
     /**
      * Get redactor settings
-     * 
+     *
+     * @param ?string $redactorConfigFile
      * @return array
      */
-    public static function getRedactorSettings(string $redactorConfigFile): array
+    public static function getRedactorSettings(?string $redactorConfigFile): array
     {
         $redactorConfig = [];
         if ($redactorConfigFile) {

diff --git a/src/models/Email.php b/src/models/Email.php
@@ -19,7 +19,7 @@ class Email extends Model
     public $dateCreated;
     public $dateUpdated;
     public $template = 'emails/template';
-    public $redactorConfig;
+    public $redactorConfig = 'Default.json';
     public $system = false;
     public $plain = false;
     public $bcc;