[Koha-cvs] CVS: koha moremember.pl,1.12,1.13

[Steve Tonnesen]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv20923

Modified Files:
        moremember.pl 
Log Message:
Merged in optional ethnicity fix from rel-1-2


Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/moremember.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** moremember.pl       22 May 2002 04:30:44 -0000      1.12
--- moremember.pl       27 Jun 2002 21:16:20 -0000      1.13
***************
*** 67,70 ****
--- 67,74 ----
      $data->{'phoneday'}=$data2->{'phoneday'};
  }
+ my $ethnicityline='';
+ if ($data->{'ethnicity'} || $data->{'ethnotes'}) {
+       $ethnicityline="Ethnicity: $data->{'ethnicity'}, 
$data->{'ethnotes'}<br>";
+ }
  print <<printend
  Postal Address: $data->{'streetaddress'}, $data->{'city'}<BR>
***************
*** 81,85 ****
  Joined: $data->{'dateenrolled'},  Expires: $data->{'expiry'} <BR>
  Joining Branch: $data->{'homebranch'}<P>
! Ethnicity: $data->{'ethnicity'}, $data->{'ethnotes'}<BR>
  DoB: $data->{'dateofbirth'}<BR>
  Sex: $data->{'sex'}<P>
--- 85,89 ----
  Joined: $data->{'dateenrolled'},  Expires: $data->{'expiry'} <BR>
  Joining Branch: $data->{'homebranch'}<P>
! $ethnicityline
  DoB: $data->{'dateofbirth'}<BR>
  Sex: $data->{'sex'}<P>