Bug 916633 - join_activity_entries doesn't reconstitute text with commas correctly.

r=glob, a=sgreen

Bug 916633 - join_activity_entries doesn't reconstitute text with commas correctly.
08680add · Simon Green · 3d9a1253 · 08680add
Commit 08680add authored Nov 08, 2013 by Simon Green
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Util.pm Bugzilla/Util.pm +3 -2

No files found.
--- 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;