Fixed updating search index jobs with emoji

putyourlightson · Dec 11, 2019 · 22b72ab · 22b72ab
1 parent 3c267de
commit 22b72ab
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # Release Notes for Campaign
 
-## 1.12.4 - Unreleased
+## 1.12.4 - 2019-12-11
 ### Changed
 - Made sendout `notificationEmailAddress` field not required.
 
 ### Fixed
 - Fixed a bug with anonymous actions in  the `WebhookController` ([#99](https://github.com/putyourlightson/craft-campaign/issues/99)).
+- Fixed a bug that was preventing updating search index jobs from completing because of an emoji in the sendout subject. ([#101](https://github.com/putyourlightson/craft-campaign/issues/101)).
 
 ## 1.12.3 - 2019-12-04
 ### Fixed

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": "1.12.3",
+    "version": "1.12.4",
     "type": "craft-plugin",
     "homepage": "https://craftcampaign.com/",
     "license": "proprietary",

diff --git a/src/elements/SendoutElement.php b/src/elements/SendoutElement.php
@@ -813,6 +813,18 @@ public function getPlaintextBody()
         return $campaign->getPlaintextBody();
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getSearchKeywords(string $attribute): string
+    {
+        if ($attribute == 'subject') {
+            return LitEmoji::unicodeToShortcode($this->$attribute);
+        }
+
+        return parent::getSearchKeywords($attribute);
+    }
+
     /**
      * @inheritdoc
      */