From b5b249290efebbbe97723b356da0d7a4c308f754 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Mon, 8 Oct 2018 15:25:50 +0100
Subject: [PATCH] Bug 21456: (QA follow-up) Catch missed case in authorities
 merge

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 796e4e5d2be5ec87970f8b586f940e4abddb687d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b9f85edd14aa4fc89b1a20457066980b4e7d4b15)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 authorities/merge.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/authorities/merge.pl b/authorities/merge.pl
index 9f725415a5..9bd91b579f 100755
--- a/authorities/merge.pl
+++ b/authorities/merge.pl
@@ -196,7 +196,7 @@ else {
                 title2          => $recordObj2->authorized_heading,
             );
             if ( $recordObj1->authtypecode ne $recordObj2->authtypecode ) {
-                my $authority_types = Koha::Authority::Types->search( { authtypecode => { '!=' => '' } }, { order_by => ['authtypecode'] } );
+                my $authority_types = Koha::Authority::Types->search( { authtypecode => { '!=' => '' } }, { order_by => ['authtypetext'] } );
                 $template->param(
                     frameworkselect => $authority_types->unblessed,
                     frameworkcode1  => $recordObj1->authtypecode,
-- 
2.39.5