// 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
This commit is contained in:
1 parent
0050c43675
commit
8657b584c5
1 file changed
+2
-1
@@ -692,7 +692,8 @@ class Swift_Message extends Swift_Message_Mime
|
|||||||
break;
|
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];
|
$mixed = $this->getReference("parent", $new_branch);//parentRefs[$new_branch];
|
||||||
$this->setReference("parent", $old_branch, $mixed);//parentRefs[$old_branch] = $mixed;
|
$this->setReference("parent", $old_branch, $mixed);//parentRefs[$old_branch] = $mixed;
|
||||||
switch ($new_branch)
|
switch ($new_branch)
|
||||||
|
|||||||
Reference in new issue
Block a user