From 398a4d5242988e83c3e7e3ca50fb2fb64fb8b5f0 Mon Sep 17 00:00:00 2001
From: wolfpac444 <wolfpac444>
Date: Wed, 26 Mar 2003 03:02:13 +0000
Subject: [PATCH] Fixed Bug #230.

---
 .../intranet-tmpl/default/en/members/memberentry.tmpl     | 2 +-
 memberentry.pl                                            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index 592764e19a..232d9f6cb8 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -23,7 +23,7 @@
       <td COLSPAN=2 ALIGN=RIGHT background="<TMPL_VAR name="themelang">/images/background-mem.gif">*
         <input type="radio" name="sex" value="F"<TMPL_IF NAME=female> checked</TMPL_IF>>F
         <input type="radio" name="sex" value="M"<TMPL_UNLESS NAME=female> checked</TMPL_UNLESS>> M
-        &nbsp; &nbsp;  <B>Date of Birth</B> (dd/mm/yy)
+        &nbsp; &nbsp;  <B>Date of Birth</B> (<TMPL_VAR NAME=dateformat>)
         <input type=text name=dateofbirth size=10 value="<TMPL_VAR NAME=dateofbirth>">
       </td>
     </tr>
diff --git a/memberentry.pl b/memberentry.pl
index 725a842b65..72d2314f79 100755
--- a/memberentry.pl
+++ b/memberentry.pl
@@ -36,6 +36,7 @@ use C4::Members;
 use C4::Koha;
 use HTML::Template;
 use Date::Manip;
+use C4::Date;
 
 my $input = new CGI;
 
@@ -176,9 +177,7 @@ if ($delete){
   }
 
   #Convert dateofbirth to correct format
-  $data->{'dateofbirth'}=ParseDate($data->{'dateofbirth'});
-  $data->{'dateofbirth'}=UnixDate($data->{'dateofbirth'},'%d/%m/%Y');
-
+  $data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
 
   $template->param( 
   			member          => $member,
@@ -208,7 +207,8 @@ if ($delete){
   			dateenrolled	=> $data->{'dateenrolled'},
   			expiry		=> $data->{'expiry'},
   			cardnumber	=> $cardnumber,
-  			dateofbirth	=> $data->{'dateofbirth'});
+  			dateofbirth	=> $data->{'dateofbirth'},
+			dateformat      => display_date_format());
 
 output_html_with_http_headers $input, $cookie, $template->output;
 
-- 
2.39.5