diff options
| author |   Simon Green <sgreen@redhat.com> | 2013-11-08 10:40:40 +1000 |
|---|---|---|
| committer | Simon Green <sgreen@redhat.com> | 2013-11-08 10:40:40 +1000 |
| commit | 08680add732f86b4bd13ac9d0ddaf719b09bd5f9 (patch) | |
| tree | 65f25efb4268225f94135c6c4e2f09cc015b7200 | |
| parent | Bug 934573 - Date range for Bug.history WebService API method (diff) | |
| download | bugzilla-08680add732f86b4bd13ac9d0ddaf719b09bd5f9.tar.gz bugzilla-08680add732f86b4bd13ac9d0ddaf719b09bd5f9.tar.bz2 bugzilla-08680add732f86b4bd13ac9d0ddaf719b09bd5f9.zip | |
Bug 916633 - join_activity_entries doesn't reconstitute text with commas correctly.
r=glob, a=sgreen
| -rw-r--r-- | Bugzilla/Util.pm | 5 |
1 files 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; |