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 a9ff86c8b71116e205ed15ad655268d220041a3c..bda0e0c9039e8503277ffea7a6312512713d951f 100644 (file)
--- 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;