Ensure unicodeToShortcode receives a string

putyourlightson · Jun 13, 2023 · d55d19f · d55d19f
1 parent 3271dd3
commit d55d19f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Campaign
 
+## 2.8.3 - Unreleased
+### Fixed
+Fixed a bug that was causing errors when updating search indexes when a sendout’s subject was not set ([#397](https://github.com/putyourlightson/craft-campaign/issues/397)).
+
 ## 2.8.2 - 2023-06-12
 ### Fixed
 Fixed a bug in which Campaign dashboard widgets were throwing exceptions when a date range was set ([#396](https://github.com/putyourlightson/craft-campaign/issues/396)).

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "putyourlightson/craft-campaign",
     "description": "Send and manage email campaigns, contacts and mailing lists.",
-    "version": "2.8.2",
+    "version": "2.8.3",
     "type": "craft-plugin",
     "homepage": "https://putyourlightson.com/plugins/campaign",
     "license": "proprietary",

diff --git a/src/elements/SendoutElement.php b/src/elements/SendoutElement.php
@@ -1082,7 +1082,7 @@ public function getPlaintextBody(): ?string
     public function getSearchKeywords(string $attribute): string
     {
         if ($attribute == 'subject') {
-            return LitEmoji::unicodeToShortcode($this->{$attribute});
+            return LitEmoji::unicodeToShortcode($this->{$attribute} ?? '');
         }
 
         return parent::getSearchKeywords($attribute);
@@ -1259,7 +1259,7 @@ public function beforeSave(bool $isNew): bool
 
         if (Craft::$app->getDb()->getIsMysql()) {
             // Encode subject for emojis
-            $this->subject = LitEmoji::unicodeToShortcode($this->subject);
+            $this->subject = LitEmoji::unicodeToShortcode($this->subject ?? '');
         }
 
         if (Campaign::$plugin->settings->showSendoutTitleField === false) {