From 458cfc81130f7e4dcade8bbf544aba095d9eb264 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Fri, 9 Oct 2015 23:11:22 +0200 Subject: [PATCH] Bug 14996: Remove C4::Dates from tags/review.pl This patch removes C4::Dates from file tags/review.pl To test: - Create some tags - Go to Home > Tools > Tags - Verify that dates display properly - Verify that the date filter works as before Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- tags/review.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tags/review.pl b/tags/review.pl index 4756672fb8..3ea36db912 100755 --- a/tags/review.pl +++ b/tags/review.pl @@ -28,7 +28,7 @@ use CGI::Cookie; # need to check cookies before having CGI parse the POST reques use C4::Auth qw(:DEFAULT check_cookie_auth); use C4::Context; -use C4::Dates qw(format_date format_date_in_iso); +use Koha::DateUtils; # use C4::Koha; use C4::Output qw(:html :ajax pagination_bar); use C4::Debug; @@ -169,7 +169,8 @@ if ($filter = $input->param('tag')) { $filters{term} = $filter; } if ($filter = $input->param('from')) { - if ($date_from = format_date_in_iso($filter)) { + $date_from = eval { output_pref( { dt => dt_from_string( $filter ), dateonly => 1, dateformat => 'iso' } ); }; + if ( $date_from ) { $template->param(filter_date_approved_from=>$filter); $filters{date_approved} = ">=$date_from"; } else { @@ -177,7 +178,8 @@ if ($filter = $input->param('from')) { } } if ($filter = $input->param('to')) { - if ($date_to = format_date_in_iso($filter)) { + $date_to = eval { output_pref( { dt => dt_from_string( $filter ), dateonly => 1, dateformat => 'iso' } ); }; + if ( $date_to ) { $template->param(filter_date_approved_to=>$filter); $filters{date_approved} = "<=$date_to"; } else { -- 2.39.5