From 8657b584c5611e898bcd3691020c0fd03b4cfafc Mon Sep 17 00:00:00 2001 From: dMetzger Date: Wed, 26 Sep 2012 13:14:29 +0000 Subject: [PATCH] // hack following up the previous one (in the same file) git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17564 b9a71923-0436-4b27-9f14-aed3839534dd --- tools/swift/Swift/Message.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/swift/Swift/Message.php b/tools/swift/Swift/Message.php index 3857ac671..95cb7635a 100644 --- a/tools/swift/Swift/Message.php +++ b/tools/swift/Swift/Message.php @@ -692,7 +692,8 @@ class Swift_Message extends Swift_Message_Mime break; } } - $this->getReference("parent", $new_branch)->removeChild($tag); + if ($this->getReference("parent", $new_branch)->hasChild($tag)) + $this->getReference("parent", $new_branch)->removeChild($tag); $mixed = $this->getReference("parent", $new_branch);//parentRefs[$new_branch]; $this->setReference("parent", $old_branch, $mixed);//parentRefs[$old_branch] = $mixed; switch ($new_branch)