Bug 425599 â\80\93 show_activity missing space for attachment flag changes

r/a=lpsolit

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 5694ac3515a2d2a7a3444292da492f106420d4d7..3d4c4b869c61c363ddbfc67bd7e88f9af3d9bf6a 100755 (executable)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -2892,7 +2892,7 @@ sub GetBugActivity {
 
         if ($activity_visible) {
             # This gets replaced with a hyperlink in the template.
-            $field =~ s/^Attachment// if $attachid;
+            $field =~ s/^Attachment\s*// if $attachid;
 
             # Check for the results of an old Bugzilla data corruption bug
             $incomplete_data = 1 if ($added =~ /^\?/ || $removed =~ /^\?/);

diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl
index c1e3c399044604392c1824698bdb0626ecc038c8..b676eb1c9d021e24925c53e2dcfddd55fc4e59f5 100644 (file)
--- a/template/en/default/bug/activity/table.html.tmpl
+++ b/template/en/default/bug/activity/table.html.tmpl
@@ -73,7 +73,7 @@
                 <a href="attachment.cgi?id=[% change.attachid %]">
                 Attachment #[% change.attachid %]</a>
               [% END %]
-              [% change.field %]
+              [%+ change.field %]
             </td>
             <td>
               [% IF change.removed.defined %]