From 08680add732f86b4bd13ac9d0ddaf719b09bd5f9 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Fri, 8 Nov 2013 10:40:40 +1000
Subject: Bug 916633 - join_activity_entries doesn't reconstitute text with
 commas correctly. r=glob, a=sgreen

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

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index a9ff86c8b..bda0e0c90 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -496,8 +496,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