resolve conflict

EC-CUBE · Oct 21, 2019 · 5a8d809 · 5a8d809
1 parent 6451531
commit 5a8d809
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/data/class/SC_SendMail.php b/data/class/SC_SendMail.php
@@ -357,14 +357,6 @@ public function getBackendParams($backend)
         switch ($backend) {
             case 'mail':
                 $arrParams = array();
-                $objDb = new SC_Helper_DB_Ex();
-                $objSite = $objDb->sfGetBasisData();
-                if(!empty($objSite['email04']) && strpos($objSite['email04'],"@") > 0)
-                {
-                    $arrParams[] = "-f ".$objSite['email04'];
-                }
-                break;
-
             case 'sendmail':
                 $arrParams = array(
                     'sendmail_path' => '/usr/bin/sendmail',