Revert "fix for bug 1468, but not sure if this is the best"

This reverts commit ae206e86adf8eb281fd1029364c1e705f2ffa197.

diff --git a/C4/Members.pm b/C4/Members.pm
index 3dc493a..b2f57c9 100644 (file)
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -608,7 +608,7 @@ sub ModMember {
     if ( $data{'password'} eq '****' ) {
         delete $data{'password'};
         foreach (keys %data)
-        {push @parameters,"$_ = ".$dbh->quote($data{$_}) if ($_ ne "flags" and $_ ne "borrowernumber" and $hashborrowerfields{$_}) } ;
+        {push @parameters,"$_ = ".$dbh->quote($data{$_}) if ($_ ne "borrowernumber" and $hashborrowerfields{$_}) } ;
         $query = "UPDATE borrowers SET ".join (",",@parameters)
     ." WHERE borrowernumber=$data{'borrowernumber'}";
 #         warn "$query";
@@ -619,7 +619,7 @@ sub ModMember {
         $data{'password'} = md5_base64( $data{'password'} )   if ( $data{'password'} ne '' );
         delete $data{'password'} if ($data{password} eq "");
         foreach (keys %data)
-        {push @parameters,"$_ = ".$dbh->quote($data{$_}) if ($_ ne "flags" and $_ ne "borrowernumber" and $hashborrowerfields{$_})} ;
+        {push @parameters,"$_ = ".$dbh->quote($data{$_}) if ($_ ne "borrowernumber" and $hashborrowerfields{$_})} ;
         
         $query = "UPDATE borrowers SET ".join (",",@parameters)." WHERE borrowernumber=$data{'borrowernumber'}";
 #         warn "$query";
@@ -754,6 +754,7 @@ sub AddMember {
       . ",debarred="
       . $dbh->quote( $data{'debarred'} )
       . ",ethnicity="
+      . $dbh->quote( $data{'ethnicity'} )
       . ",ethnotes="
       . $dbh->quote( $data{'ethnotes'} );