From 803c43e994f0b9d2fa17e94cadfe30664055b9a0 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 6 May 2021 11:18:55 +0200
Subject: [PATCH] Bug 28293: (bug 20443 follow-up) Fix wrong key in
 Patrons::Import->generate_patron_attributes

It generates warnings
Use of uninitialized value in string comparison (cmp) at /kohadevbox/koha/Koha/Patrons/Import.pm line 550, <$fh> line 2.

And does not sort correctly (no fallback on the attribute's value for repeatable attributes)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 2da36e3f175de1fcf23bdfbc96b8053f3a0a7d26)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit e36f7b988043342a4a162df306d7f66b98142cfb)

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
---
 Koha/Patrons/Import.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Koha/Patrons/Import.pm b/Koha/Patrons/Import.pm
index d951bf54ed..c0269106eb 100644
--- a/Koha/Patrons/Import.pm
+++ b/Koha/Patrons/Import.pm
@@ -538,7 +538,7 @@ sub generate_patron_attributes {
     my $ok   = $csv->parse($string);  # parse field again to get subfields!
     my @list = $csv->fields();
     my @patron_attributes =
-      sort { $a->{code} cmp $b->{code} || $a->{value} cmp $b->{value} }
+      sort { $a->{code} cmp $b->{code} || $a->{attribute} cmp $b->{attribute} }
       map {
         my @arr = split /:/, $_, 2;
         { code => $arr[0], attribute => $arr[1] }
-- 
2.39.5