Attachment 88296 Details for Bug 12532 – Bug 12532 - (follow-up) clean up

[patch] Bug 12532 - (follow-up) clean up

Bug-12532---follow-up-clean-up.patch (text/plain), 1.56 KB, created by José-Mario Monteiro-Santos on 2019-04-18 12:31:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: José-Mario Monteiro-Santos

Created: 2019-04-18 12:31:46 UTC

Size: 1.56 KB

patch

obsolete

>From 6f36ec2fd7f35cfe3f811a5a466529f08e576fcf Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Mika=C3=ABl=20Olangcay=20Brisebois?=
> <mikael.olangcay-brisebois@inLibro.com>
>Date: Wed, 17 Apr 2019 11:50:48 -0400
>Subject: [PATCH] Bug 12532 - (follow-up) clean up
>
>---
> Koha/Patron.pm | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
> mode change 100644 => 100755 Koha/Patron.pm
>
>diff --git a/Koha/Patron.pm b/Koha/Patron.pm
>old mode 100644
>new mode 100755
>index c491649..bbac94d
>--- a/Koha/Patron.pm
>+++ b/Koha/Patron.pm
>@@ -1028,6 +1028,7 @@ Returns the empty string if no email address.
> sub notice_email_address{
>     my ( $self ) = @_;
>     my $address;
>+    my $guarantor_address;
> 
>     my $which_address = C4::Context->preference("AutoEmailPrimaryAddress");
>     # if syspref is set to 'first valid' (value == OFF), look up email address
>@@ -1041,11 +1042,15 @@ sub notice_email_address{
>     if ($use_guarantor) {
>         my $guarantor = $self->guarantor;
>         if ($guarantor) {
>-            my $guarantor_address = $guarantor->notice_email_address;
>+            if ( $which_address eq 'OFF' ) {
>+                $guarantor_address = $guarantor->first_valid_email_address;
>+            } else {
>+                $guarantor_address = $guarantor->$which_address || '';
>+            }
>             if ($address){
>-            $address .= ', ';
>+                $address .= ', ';
>             }
>-            $address .=  $guarantor_address if $guarantor_address;
>+                $address .=  $guarantor_address if $guarantor_address;
>         }
>     }
>     return $address;
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 12532: 29510 | 30747 | 35313 | 36752 | 39787 | 39925 | 48645 | 53649 | 53689 | 53690 | 53699 | 53700 | 55985 | 56052 | 56053 | 59445 | 59446 | 59447 | 63197 | 64802 | 64824 | 67115 | 68340 | 70865 | 72064 | 72617 | 75099 | 77606 | 80313 | 85134 | 85135 | 87815 | 87816 | 88208 | 88209 | 88210 | 88211 | 88212 | 88213 | 88295 | 88296 | 114455 | 114456 | 114457 | 114458 | 114459 | 114460 | 114461 | 131091 | 131092 | 131093 | 131094 | 149233 | 150071 | 150208 | 150217 | 150240 | 150256 | 151028 | 151029 | 154854 | 154855 | 154856 | 154857 | 155036 | 155037 | 155828 | 155829 | 155830 | 155831 | 155832 | 155833 | 155834 | 155835 | 155836 | 155837 | 155873 | 155874 | 155875 | 155876 | 155877 | 155878 | 155879 | 155880 | 155881 | 155882 | 155883 | 155886 | 155934 | 155935 | 155936 | 155937 | 155938 | 155939 | 155940 | 155941 | 155942 | 155943 | 155944 | 155945 | 155946