Merge pull request #174 from hryvinskyi/patch-2

srenon · web-flow · commit e1b29067e037 · 2020-12-20T13:57:49.000-05:00
Added php7.4 support
diff --git a/Model/ZendMailTwo/Smtp.php b/Model/ZendMailTwo/Smtp.php
@@ -274,7 +274,7 @@ public function updateMailHeader($header)
     public function getFromEmailAddress()
     {
         $result = $this->storeModel->getFrom();
-        return $result['email'];
+        return isset($result['email']) ? $result['email'] : '';
     }
 
     /**
@@ -283,6 +283,6 @@ public function getFromEmailAddress()
     public function getFromName()
     {
         $result = $this->storeModel->getFrom();
-        return $result['name'];
+        return isset($result['name']) ? $result['name'] : '';
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ public function updateMailHeader($header)`
`274`	`274`	`public function getFromEmailAddress()`
`275`	`275`	`{`
`276`	`276`	`$result = $this->storeModel->getFrom();`
`277`		`- return $result['email'];`
	`277`	`+ return isset($result['email']) ? $result['email'] : '';`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`/**`
`@@ -283,6 +283,6 @@ public function getFromEmailAddress()`
`283`	`283`	`public function getFromName()`
`284`	`284`	`{`
`285`	`285`	`$result = $this->storeModel->getFrom();`
`286`		`- return $result['name'];`
	`286`	`+ return isset($result['name']) ? $result['name'] : '';`
`287`	`287`	`}`
`288`	`288`	`}`