From c151184104110a5f42fea1ce86e6d59595c389a3 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Fri, 7 May 2010 14:28:29 +0200
Subject: [PATCH] Fix sending mails with empty bodies.

---
 framework/Mime/lib/Horde/Mime/Mail.php       |  3 +--
 framework/Mime/test/Horde/Mime/mail_009.phpt | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 framework/Mime/test/Horde/Mime/mail_009.phpt

diff --git a/framework/Mime/lib/Horde/Mime/Mail.php b/framework/Mime/lib/Horde/Mime/Mail.php
index d58d4f195..3504d8870 100644
--- a/framework/Mime/lib/Horde/Mime/Mail.php
+++ b/framework/Mime/lib/Horde/Mime/Mail.php
@@ -442,9 +442,8 @@ class Horde_Mime_Mail
             }
 
             /* Build mime message. */
-            $body = null;
+            $body = new Horde_Mime_Part();
             if (!empty($this->_body) && !empty($this->_htmlBody)) {
-                $body = new Horde_Mime_Part();
                 $body->setType('multipart/alternative');
                 $this->_body->setDescription(_("Plaintext Version of Message"));
                 $body->addPart($this->_body);
diff --git a/framework/Mime/test/Horde/Mime/mail_009.phpt b/framework/Mime/test/Horde/Mime/mail_009.phpt
new file mode 100644
index 000000000..718b1b138
--- /dev/null
+++ b/framework/Mime/test/Horde/Mime/mail_009.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Horde_Mime_Mail empty body test.
+--FILE--
+<?php
+
+require_once 'Horde/String.php';
+require_once 'Horde/Util.php';
+require dirname(__FILE__) . '/mail_dummy.inc';
+
+$mail = new Horde_Mime_Mail(array('subject' => 'My Subject',
+                                  'to' => 'recipient@example.com',
+                                  'from' => 'sender@example.com',
+                                  'charset' => 'iso-8859-15'));
+$dummy = Mail::factory('dummy');
+$mail->send($dummy);
+echo $dummy->send_output;
+
+?>
+--EXPECTF--
+Subject: My Subject
+To: recipient@example.com
+From: sender@example.com
+Message-ID: <%d.%s@mail.example.com>
+User-Agent: Horde Application Framework 4
+Date: %s, %d %s %d %d:%d:%d %s%d
+Content-Type: application/octet-stream
+MIME-Version: 1.0
-- 
2.11.0