From 1f8e8d0e1914f61f0cffcf9acbf236d2347ec260 Mon Sep 17 00:00:00 2001
From: Arthur Suzuki <arthur.suzuki@biblibre.com>
Date: Tue, 25 Jun 2019 11:17:24 +0200
Subject: [PATCH] Bug 23199: Koha::Patron->store must check 'uppercasesurname'
 syspref

Test plan:
1/ set uppercasesurname to 'Do'
2/ register a new patron using the REST API with lowercase surname
3/ verify the surname is not saved in uppercase
4/ apply patch
5/ repeat 2
6/ verify the surname now is saved to uppercase
---
 Koha/Patron.pm         | 4 ++++
 members/memberentry.pl | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Koha/Patron.pm b/Koha/Patron.pm
index 6a25d717c1..30d5038536 100644
--- a/Koha/Patron.pm
+++ b/Koha/Patron.pm
@@ -193,6 +193,10 @@ sub store {
 
             $self->trim_whitespaces;
 
+            # Set surname to uppercase if uppercasesurname is true
+	    $self->surname( uc($self->surname) )
+		if C4::Context->preference("uppercasesurname");
+
             unless ( $self->in_storage ) {    #AddMember
 
                 # Generate a valid userid/login if needed
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 166302006b..442be451b3 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -343,10 +343,6 @@ if ($op eq 'save' || $op eq 'insert'){
         }
     }
   
-    if($newdata{surname} && C4::Context->preference('uppercasesurnames')) {
-        $newdata{'surname'} = uc($newdata{'surname'});
-    }
-
   if (C4::Context->preference("IndependentBranches")) {
     unless ( C4::Context->IsSuperLibrarian() ){
       $debug and print STDERR "  $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch};
-- 
2.11.0