From 75eaf0d6c8ecf764d73cb870e504e84826d44751 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Tue, 4 Mar 2014 13:58:48 +0800
Subject: Bug 916633: join_activity_entries doesn't reconstitute text with
 commas correctly.

---
 Bugzilla/Bug.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Bugzilla/Bug.pm')

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 295befa9c..b6861b509 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -4084,8 +4084,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;
-- 
cgit v1.2.3-24-g4f1b