From 53e060308d163fed9411c3d4a4b5027aba6832bc Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Tue, 1 Sep 2015 16:11:54 +0200 Subject: [PATCH] Bug 14683: [QA Follow-up] Similar change for staff Script memberentry.pl contained a similar line. Solution is simpler here. Test plan: [1] Add, change or clear the sms number at staff side. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit bdf4894c507f4bac6b2b79c7ca3b7a556d246ed5) Signed-off-by: Chris Cormack (cherry picked from commit c323e07c0c7ec403af15e40da7d82b997cb3eefc) Signed-off-by: Liz Rea --- members/memberentry.pl | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/members/memberentry.pl b/members/memberentry.pl index 3253171f89..0d912b5700 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -354,14 +354,10 @@ if ( ($op eq 'modify' || $op eq 'insert' || $op eq 'save'|| $op eq 'duplicate') } } -if ( - defined $input->param('SMSnumber') - && ( - $input->param('SMSnumber') eq "" - or $input->param('SMSnumber') ne $newdata{'mobile'} - ) -) { - $newdata{smsalertnumber} = $input->param('SMSnumber'); +# BZ 14683: Do not mixup mobile [read: other phone] with smsalertnumber +my $sms = $input->param('SMSnumber'); +if ( defined $sms ) { + $newdata{smsalertnumber} = $sms; } ### Error checks should happen before this line. @@ -664,7 +660,7 @@ if (C4::Context->preference('EnhancedMessagingPreferences')) { C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template); } $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver")); - $template->param(SMSnumber => defined $data{'smsalertnumber'} ? $data{'smsalertnumber'} : $data{'mobile'}); + $template->param(SMSnumber => $data{'smsalertnumber'} ); $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification")); } -- 2.39.5