From fac0457436eea409444b08956f2b3a069825ab23 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Tue, 29 Dec 2020 09:39:14 -0700
Subject: [PATCH] Addressbook: Fix sort changes wouldn't stay in some
 circumstances

In particular, sorting by Name would always reset
---
 addressbook/inc/class.addressbook_ui.inc.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 6c3da62b01..b30489405a 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -2113,7 +2113,11 @@ class addressbook_ui extends addressbook_bo
 			$rows['no_event_column'] = true;
 		}
 
-		$rows['order'] = $order;
+		// If we've changed the sort order on them, update the display
+		if($order !== $query['order'] )
+		{
+			$rows['order'] = $order;
+		}
 		$rows['call_popup'] = $this->config['call_popup'];
 		$rows['customfields'] = array_values($this->customfields);