From 5c7a5ee4d9a82f04816b280a461fb8a5727f1226 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Fri, 19 Oct 2012 20:51:34 +0200 Subject: Bug 803600: Clean up the comment generated when deleting attachments r=justdave a=LpSolit --- attachment.cgi | 1 - template/en/default/attachment/delete_reason.txt.tmpl | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/attachment.cgi b/attachment.cgi index 775a91f00..120cc2b45 100755 --- a/attachment.cgi +++ b/attachment.cgi @@ -751,7 +751,6 @@ sub delete_attachment { # The token is valid. Delete the content of the attachment. my $msg; $vars->{'attachment'} = $attachment; - $vars->{'date'} = $date; $vars->{'reason'} = clean_text($cgi->param('reason') || ''); $template->process("attachment/delete_reason.txt.tmpl", $vars, \$msg) diff --git a/template/en/default/attachment/delete_reason.txt.tmpl b/template/en/default/attachment/delete_reason.txt.tmpl index 7d45efec0..16315550d 100644 --- a/template/en/default/attachment/delete_reason.txt.tmpl +++ b/template/en/default/attachment/delete_reason.txt.tmpl @@ -9,17 +9,10 @@ [%# INTERFACE: # attachment: object of the attachment the user wants to delete. # reason: string; The reason provided by the user. - # date: the date when the request to delete the attachment was made. #%] -The content of attachment [% attachment.id %] has been deleted by - [%+ user.identity %] -[% IF reason %] -who provided the following reason: +The content of attachment [% attachment.id %] has been deleted +[%~ IF reason %] for the following reason: [%+ reason %] -[% ELSE %] -without providing any reason. [% END %] - -The token used to delete this attachment was generated at [% date FILTER time %]. -- cgit v1.2.3-24-g4f1b