Merge to 2.2.12a

Alinto · Dec 19, 2014 · 562d3db · 562d3db
2 parents d3914ae + df8a0d8
commit 562d3db
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,31 @@
+commit e6cc56dca1126e09cb8336bdbd4e5dabc7b83cf1
+Author: Ludovic Marcotte <[email protected]>
+Date:   Fri Dec 19 09:03:19 2014 -0500
+
+    Bumped version to 2.2.12a
+
+M	Version
+
+commit de3d38262b047a1b72ec9a49042059b90e2abc2c
+Author: Ludovic Marcotte <[email protected]>
+Date:   Fri Dec 19 09:01:39 2014 -0500
+
+    Fix for bug #3034
+
+M	NEWS
+M	SoObjects/Mailer/SOGoDraftObject.m
+
+commit db911f323d23f263f5fa9c5fb02d8234127687b3
+Author: Ludovic Marcotte <[email protected]>
+Date:   Thu Dec 18 08:56:23 2014 -0500
+
+    Updated ChangeLog and version numbers for the release
+
+M	ChangeLog
+M	Documentation/docinfo.xml
+M	Documentation/includes/global-attributes.asciidoc
+M	Version
+
 commit fcddb37a0dd76f75bb16f9380e8b8a01865d0c4c
 Author: Ludovic Marcotte <[email protected]>
 Date:   Thu Dec 18 08:53:31 2014 -0500

diff --git a/NEWS b/NEWS
@@ -1,3 +1,9 @@
+2.2.12a (2014-12-19)
+--------------------
+
+Bug fixes
+ - fix empty HTML mails being sent (#3034)
+
 2.2.12 (2014-12-18)
 -------------------
 

diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
@@ -1217,13 +1217,13 @@ - (NGMimeMessage *) mimeMessageForContentWithHeaderMap: (NGMutableHashMap *) map
 
   if (!isHTML)
     {
-      [map setObject: contentTypeValue  forKey: @"content-type"];
+      [message setHeader: contentTypeValue  forKey: @"content-type"];
       body = text;
     }
   else
     {
       body = [[[NGMimeMultipartBody alloc] initWithPart: message] autorelease];
-      [map addObject: MultiAlternativeType forKey: @"content-type"];
+      [message setHeader: MultiAlternativeType forKey: @"content-type"];
 
       // Get the text part from it and add it
       [body addBodyPart: [self plainTextBodyPartForText]];

diff --git a/Version b/Version
@@ -4,4 +4,4 @@
 
 MAJOR_VERSION=2
 MINOR_VERSION=2
-SUBMINOR_VERSION=12
+SUBMINOR_VERSION=12a