Merge pull request #58 from sailthru/develop

Fix for broken update customer email and version update.
sailthru · Nov 19, 2019 · c7db518 · c7db518
2 parents 0da6a6d + 087128e
commit c7db518
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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(

diff --git 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
@@ -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>