From: Simon Green <sgreen@redhat.com>
Date: Fri, 8 Nov 2013 00:40:56 +0000 (+1000)
Subject: Bug 916633 - join_activity_entries doesn't reconstitute text with commas correctly.
X-Git-Tag: bugzilla-4.4.2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a76101f090a80f7ea653a78037b3d1e6ad2909d;p=thirdparty%2Fbugzilla.git

Bug 916633 - join_activity_entries doesn't reconstitute text with commas correctly.
r=glob, a=sgreen
---

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index a96d8656a7..7218974137 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -494,8 +494,9 @@ sub join_activity_entries {
         return $current_change . $new_change;
     }
 
-    # All other fields get a space
-    if (substr($new_change, 0, 1) eq ' ') {
+    # All other fields get a space unless the first character of the second
+    # string is a comma or space
+    if (substr($new_change, 0, 1) eq ',' || substr($new_change, 0, 1) eq ' ') {
         return $current_change . $new_change;
     } else {
         return $current_change . ' ' . $new_change;