diff options
| author | lpsolit%gmail.com <> | 2007-08-08 21:14:23 +0200 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2007-08-08 21:14:23 +0200 |
| commit | 1e87283250635a69e5d855d1bd5d075253796e88 (patch) | |
| tree | 0d0ef94cf2683dfd1652dd858f3dc17ffe231ac9 /Bugzilla | |
| parent | 152f61366bd9b268cd838307c1e58399003ef2c7 (diff) | |
| download | bugzilla-1e87283250635a69e5d855d1bd5d075253796e88.tar.gz bugzilla-1e87283250635a69e5d855d1bd5d075253796e88.tar.xz | |
Hum... 2nd attempt to fix bug 332149. I committed the wrong patch *and* I lost connection in the middle of the commit. Bad!
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/BugMail.pm | 13 | ||||
| -rw-r--r-- | Bugzilla/Install/DB.pm | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 0d5d3fd78..c9f09c551 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -227,8 +227,7 @@ sub Send { my $diffpart = {}; if ($who ne $lastwho) { $lastwho = $who; - $fullwho = $whoname ? "$whoname <$who" . Bugzilla->params->{'emailsuffix'} . ">" : - "$who" . Bugzilla->params->{'emailsuffix'}; + $fullwho = $whoname ? "$whoname <$who>" : $who; $diffheader = "\n$fullwho changed:\n\n"; $diffheader .= FormatTriple("What ", "Removed", "Added"); $diffheader .= ('-' x 76) . "\n"; @@ -703,14 +702,8 @@ sub prepare_comments { my $result = ""; foreach my $comment (@$raw_comments) { if ($count) { - my $author = $comment->{'author'}; - $result .= "\n\n--- Comment #$count from "; - if ($author->name) { - $result .= $author->name . " <" . $author->email . ">"; - } else { - $result .= $author->email; - } - $result .= " " . format_time($comment->{'time'}) . " ---\n"; + $result .= "\n\n--- Comment #$count from " . $comment->{'author'}->identity . + " " . format_time($comment->{'time'}) . " ---\n"; } # Format language specific comments. We don't update $comment->{'body'} # directly, otherwise it would grow everytime you call format_comment() diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm index 5106fd525..aa3c89d23 100644 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@ -510,7 +510,7 @@ sub update_table_definitions { # 2007-05-17 LpSolit@gmail.com - Bug 344965 _initialize_workflow($old_params); - # 2007-07-11 LpSolit@gmail.com - Bug 332149 + # 2007-08-08 LpSolit@gmail.com - Bug 332149 $dbh->bz_add_column('groups', 'icon_url', {TYPE => 'TINYTEXT'}); ################################################################ |