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

2012-08-02 08:34:05 +00:00
parent e07170c363
commit 789d8ebe30
2 changed files with 3 additions and 4 deletions
@@ -254,9 +254,7 @@ class MailCore
 			$swift->disconnect();
 			return $send;
 		}
-
-		catch (Swift_ConnectionException $e)
-		{
+		catch (Swift_Exception $e) {
 			return false;
 		}
 	}
@@ -620,7 +620,8 @@ class Swift_Message extends Swift_Message_Mime
        case "mixed": $this->getReference("mixed", $tag)->addChild($ref, $id, $sign);
          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;
  }