From ca0bf13bd02d949140ab24ef3eff075501b3d209 Mon Sep 17 00:00:00 2001 From: wolfpac444 Date: Fri, 28 Mar 2003 23:03:51 +0000 Subject: [PATCH] Fixed bug #241 --- C4/Date.pm | 36 +------------------ koha-tmpl/opac-tmpl/default/en/opac-user.tmpl | 2 -- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/C4/Date.pm b/C4/Date.pm index f6c1e5859b..5e3a6cfdd6 100644 --- a/C4/Date.pm +++ b/C4/Date.pm @@ -17,10 +17,10 @@ $VERSION = 0.01; @EXPORT = qw( &display_date_format &format_date - &format_date_in_iso ); + sub get_date_format { #Get the database handle @@ -68,19 +68,16 @@ sub format_date if ( $dateformat eq "us" ) { - Date_Init("DateFormat=US"); $olddate = ParseDate($olddate); $newdate = UnixDate($olddate,'%m/%d/%Y'); } elsif ( $dateformat eq "metric" ) { - Date_Init("DateFormat=metric"); $olddate = ParseDate($olddate); $newdate = UnixDate($olddate,'%d/%m/%Y'); } elsif ( $dateformat eq "iso" ) { - Date_Init("DateFormat=iso"); $olddate = ParseDate($olddate); $newdate = UnixDate($olddate,'%Y-%m-%d'); } @@ -90,35 +87,4 @@ sub format_date } } -sub format_date_in_iso -{ - my $olddate = shift; - my $newdate; - - my $dateformat = get_date_format(); - - if ( $dateformat eq "us" ) - { - Date_Init("DateFormat=US"); - $olddate = ParseDate($olddate); - } - elsif ( $dateformat eq "metric" ) - { - Date_Init("DateFormat=metric"); - $olddate = ParseDate($olddate); - } - elsif ( $dateformat eq "iso" ) - { - Date_Init("DateFormat=iso"); - $olddate = ParseDate($olddate); - } - else - { - return "9999-99-99"; - } - - $newdate = UnixDate($olddate, '%Y-%m-%d'); - - return $newdate; -} 1; diff --git a/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl index 0e47d8e66a..451b651d08 100644 --- a/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl +++ b/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl @@ -39,7 +39,6 @@ Are any of our records incorrect? Have you moved recently, got a new phone numbe -
You have Outstanding charges and fines of
@@ -47,7 +46,6 @@ Are any of our records incorrect? Have you moved recently, got a new phone numbe -
You have a credit of
-- 2.39.5