From 2dc5a45f7bb68bf813f90f99f69a6e1d359f9123 Mon Sep 17 00:00:00 2001
From: Robert Sargsyan <robert.sargsyan@mco.com>
Date: Tue, 22 Oct 2019 17:56:24 -0700
Subject: [PATCH 1/2] Fix issue 56

Fix account email address update crush on sailthru
---
 Mail/Template.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Mail/Template.php b/Mail/Template.php
index 44818ed..bbabcd2 100644
--- a/Mail/Template.php
+++ b/Mail/Template.php
@@ -165,6 +165,10 @@ public function loadDefault($templateId)
                         trim(preg_replace('/(\s\s+|var|{|})/', '', $directiveString))
                     );
 
+                    if (count($directiveString) < 2) {
++                        continue;
++                    }
+
                     $directiveString[0] = trim(preg_replace('/(]\)|")/', '', $directiveString[0]));
 
                     $this->templateDirectives[strtolower(str_replace(' ', '_', $directiveString[1]))] = str_replace(

From 087128e39c49b22aa6f9e5e349f8a3fdf6e5052d Mon Sep 17 00:00:00 2001
From: Austin Brown <abrown@sailthru.com>
Date: Tue, 19 Nov 2019 12:15:26 -0500
Subject: [PATCH 2/2] Update version number.

---
 Mail/Template.php | 6 +++---
 composer.json     | 2 +-
 etc/module.xml    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Mail/Template.php b/Mail/Template.php
index bbabcd2..651835e 100644
--- a/Mail/Template.php
+++ b/Mail/Template.php
@@ -166,9 +166,9 @@ public function loadDefault($templateId)
                     );
 
                     if (count($directiveString) < 2) {
-+                        continue;
-+                    }
-
+                        continue;
+                    }
+                    
                     $directiveString[0] = trim(preg_replace('/(]\)|")/', '', $directiveString[0]));
 
                     $this->templateDirectives[strtolower(str_replace(' ', '_', $directiveString[1]))] = str_replace(
diff --git a/composer.json b/composer.json
index 17f6f78..feaabb6 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "magento/module-catalog": "^101.*",
     "magento/module-customer": "^100.1.*"
   },
-  "version": "1.5.1",
+  "version": "1.5.2",
   "autoload": {
     "files": [ "registration.php" ],
     "psr-4": { "Sailthru\\MageSail\\": "" }
diff --git a/etc/module.xml b/etc/module.xml
index 0954036..30eff96 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -5,7 +5,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Sailthru_MageSail" setup_version="1.5.1" >
+    <module name="Sailthru_MageSail" setup_version="1.5.2" >
     	<sequence>
     		<module name="Magento_Customer"/>
     	</sequence>