diff options
author | Simon Green <sgreen@redhat.com> | 2014-03-04 06:58:48 +0100 |
---|---|---|
committer | Byron Jones <bjones@mozilla.com> | 2014-03-04 06:58:48 +0100 |
commit | 75eaf0d6c8ecf764d73cb870e504e84826d44751 (patch) | |
tree | 68294f99303a6163939a8a03e8b54967af11fcc2 /Bugzilla/Bug.pm | |
parent | b340c4b7596361410534526e8676b47e23a926b3 (diff) | |
download | bugzilla-75eaf0d6c8ecf764d73cb870e504e84826d44751.tar.gz bugzilla-75eaf0d6c8ecf764d73cb870e504e84826d44751.tar.xz |
Bug 916633: join_activity_entries doesn't reconstitute text with commas correctly.
Diffstat (limited to 'Bugzilla/Bug.pm')
-rw-r--r-- | Bugzilla/Bug.pm | 5 |
1 files changed, 3 insertions, 2 deletions
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; |