dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] Core : Swift exception(s) handled #PSCFI-6121

Browse Source
This commit is contained in:
dMetzger
2012-08-02 08:34:05 +00:00
parent e07170c363
commit 789d8ebe30
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Mail.php
+1 -3
View File
@@ -254,9 +254,7 @@ class MailCore
$swift->disconnect(); $swift->disconnect();
return $send; return $send;
} }
catch (Swift_Exception $e) {
catch (Swift_ConnectionException $e)
{
return false; return false;
} }
} }
tools/swift/Swift/Message.php
+2 -1
View File
@@ -620,7 +620,8 @@ class Swift_Message extends Swift_Message_Mime
case "mixed": $this->getReference("mixed", $tag)->addChild($ref, $id, $sign); case "mixed": $this->getReference("mixed", $tag)->addChild($ref, $id, $sign);
break; break;
} }
$this->getReference("parent", $old_branch)->removeChild($id); if ($this->getReference("parent", $old_branch)->hasChild($id))
$this->getReference("parent", $old_branch)->removeChild($id);
} }
$this->setReference("parent", $old_branch, $new); //parentRefs[$old_branch] = $new; $this->setReference("parent", $old_branch, $new); //parentRefs[$old_branch] = $new;
} }