From 5b6352a528dfc9e2bea243befdbd5bc9d833fb20 Mon Sep 17 00:00:00 2001 From: bshuttle Date: Thu, 31 Aug 2006 15:21:42 +0000 Subject: [PATCH] merge -r5900:5902 --- lib/browse/DocumentCollection.inc.php | 8 +++++--- plugins/ktcore/KTColumns.inc.php | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/browse/DocumentCollection.inc.php b/lib/browse/DocumentCollection.inc.php index fa83060..9deea82 100644 --- a/lib/browse/DocumentCollection.inc.php +++ b/lib/browse/DocumentCollection.inc.php @@ -310,9 +310,11 @@ class AdvancedCollection { $this->sort_order = KTUtil::arrayGet($aOptions, 'sort_order', 'asc'); // url options - $sURL = KTUtil::arrayGet($aOptions, 'return_url', false); - if($sURL === false) $sUrl = KTUtil::arrayGet($aOptions, 'result_url', $_SERVER['PHP_SELF']); - $this->returnURL = $sURL; + $sURL = KTUtil::arrayGet($aOptions, 'return_url', false); + if($sURL === false) { + $sURL = KTUtil::arrayGet($aOptions, 'result_url', $_SERVER['PHP_SELF']); + } + $this->returnURL = $sURL; $this->empty_message = KTUtil::arrayGet($aOptions, 'empty_message', _kt("No folders or documents in this location.")); } diff --git a/plugins/ktcore/KTColumns.inc.php b/plugins/ktcore/KTColumns.inc.php index fff0475..42f678d 100644 --- a/plugins/ktcore/KTColumns.inc.php +++ b/plugins/ktcore/KTColumns.inc.php @@ -143,7 +143,7 @@ class AdvancedDateColumn extends AdvancedColumn { return array(null, null, null); } function addToDocumentQuery() { - return array(null, null, $this->name); + return array(null, null, $this->document_sort_column); } } @@ -422,4 +422,4 @@ class ContainingFolderColumn extends AdvancedColumn { function getName() { return _kt('Opening Containing Folder'); } } -?> \ No newline at end of file +?> -- libgit2 0.21.4