From 569bbbc227c9db3a8bf4e3142e0dbe21d4d47a7f Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <puck@catalyst.net.nz>
Date: Mon, 1 Oct 2007 09:41:55 +1300
Subject: [PATCH 1/3] Add default secondary sort on fullname.

---
 inc/RSCDSUser.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/inc/RSCDSUser.php b/inc/RSCDSUser.php
index b690e6c3..aa8523b9 100644
--- a/inc/RSCDSUser.php
+++ b/inc/RSCDSUser.php
@@ -125,6 +125,10 @@ class RSCDSUser extends User
     else
       $browser->AddOrder( 'rt_name', 'A' );
 
+    # We always want a secondary sort on fullname.
+    if ( isset( $_GET['o'] ) && $_GET['o'] != 'fullname' ) )
+      $browser->AddOrder( 'fullname', 'D' );
+
     if ( $c->enable_row_linking ) {
       $browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"".translate("Click to display that user")."\" class=\"r%d\">\n", "</tr>\n", '#even' );
     }

From 7e3735e35d8380ce919514f322ea7a5c032b807e Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <puck@catalyst.net.nz>
Date: Mon, 1 Oct 2007 10:38:14 +1300
Subject: [PATCH 2/3] Fix up syntax, and use added feature to AddOrder to allow
 secondary sorts to be added.

---
 inc/RSCDSUser.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/inc/RSCDSUser.php b/inc/RSCDSUser.php
index aa8523b9..8006321d 100644
--- a/inc/RSCDSUser.php
+++ b/inc/RSCDSUser.php
@@ -126,8 +126,9 @@ class RSCDSUser extends User
       $browser->AddOrder( 'rt_name', 'A' );
 
     # We always want a secondary sort on fullname.
-    if ( isset( $_GET['o'] ) && $_GET['o'] != 'fullname' ) )
-      $browser->AddOrder( 'fullname', 'D' );
+    if ( ! isset( $_GET['o'] ) ||
+         ( isset( $_GET['o'] ) && $_GET['o'][0] != 'fullname' ) )
+      $browser->AddOrder( 'fullname', 'A', 0, 1 );
 
     if ( $c->enable_row_linking ) {
       $browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"".translate("Click to display that user")."\" class=\"r%d\">\n", "</tr>\n", '#even' );

From f319e0f32e406056183a7265940fd21ab2e6a17c Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <puck@catalyst.net.nz>
Date: Mon, 1 Oct 2007 10:46:38 +1300
Subject: [PATCH 3/3] Fix sorting of RelationshipsTo (closes 1805272)

---
 inc/RSCDSUser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/RSCDSUser.php b/inc/RSCDSUser.php
index 8006321d..2e2b2b4e 100644
--- a/inc/RSCDSUser.php
+++ b/inc/RSCDSUser.php
@@ -204,10 +204,10 @@ EOSQL;
     $browser->SetWhere( "to_user = $this->user_no" );
 
     if ( isset( $_GET['o']) && isset($_GET['d']) ) {
-      $browser->AddOrder( $_GET['o'], $_GET['d'] );
+      $browser->AddOrder( $_GET['o'], $_GET['d'], 1 );
     }
     else
-      $browser->AddOrder( 'rt_name', 'A' );
+      $browser->AddOrder( 'rt_name', 'A', 1 );
 
     $browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"".translate("Click to display that user")."\" class=\"r%d\">\n", "</tr>\n", '#even' );
     $browser->DoQuery();