From 99cfa1c4bffc40b4ee55609e592fcb63377763b2 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Fri, 10 Oct 2014 22:18:01 +0200
Subject: [PATCH] Bug 13071: format_date should not be called in currency.pl
Content-Type: text/plain; charset=utf-8
The TT plugin is used in the template, it is useless and can cause
problems to format the dates before sending them to the template.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes the problem I was seeing before, didn't find any regressions.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Checked all three settings of dateformat. Looks fine to me.
---
admin/currency.pl | 7 -------
.../prog/en/modules/admin/currency.tt | 2 +-
2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/admin/currency.pl b/admin/currency.pl
index 4849d31..9065681 100755
--- a/admin/currency.pl
+++ b/admin/currency.pl
@@ -42,7 +42,6 @@ use warnings;
use CGI;
use C4::Context;
use C4::Auth;
-use C4::Dates qw(format_date);
use C4::Output;
use C4::Budgets qw/GetCurrency GetCurrencies/;
@@ -103,9 +102,6 @@ sub default_path {
}
$end_of_page--;
my @display_curr = @currencies[ $offset .. $end_of_page ];
- for my $c (@display_curr) {
- $c->{timestamp} = format_date( $c->{timestamp} );
- }
my $activecurrency = GetCurrency();
$template->param(
@@ -172,9 +168,6 @@ sub add_form {
$template->param( $_ => $curr_rec->{$_} );
}
}
- if ($date) {
- $template->param( 'timestamp' => format_date($date) );
- }
return;
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
index 189aefb..cbcb1a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
@@ -101,7 +101,7 @@
<input type="text" name="isocode" id="isocode" size="5" maxlength="5" value="[% isocode %]" />
</li>
<li>
- <span class="label">Last updated: </span>[% timestamp %]
+ <span class="label">Last updated: </span>[% timestamp | $KohaDates %]
</li>
<li>
<label for="active">Active: </label>
--
1.7.7.6