Peter M. Groen / knowledgetree

Commit 5b6352a528dfc9e2bea243befdbd5bc9d833fb20

Authored by bshuttle
1 parent 56191ddf

merge -r5900:5902 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5903 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 7 additions and 5 deletions
lib/browse/DocumentCollection.inc.php
  View file @5b6352a
... ... @@ -310,9 +310,11 @@ class AdvancedCollection {
310 310 $this->sort_order = KTUtil::arrayGet($aOptions, 'sort_order', 'asc');
311 311  
312 312 // url options
313   - $sURL = KTUtil::arrayGet($aOptions, 'return_url', false);
314   - if($sURL === false) $sUrl = KTUtil::arrayGet($aOptions, 'result_url', $_SERVER['PHP_SELF']);
315   - $this->returnURL = $sURL;
  313 + $sURL = KTUtil::arrayGet($aOptions, 'return_url', false);
  314 + if($sURL === false) {
  315 + $sURL = KTUtil::arrayGet($aOptions, 'result_url', $_SERVER['PHP_SELF']);
  316 + }
  317 + $this->returnURL = $sURL;
316 318  
317 319 $this->empty_message = KTUtil::arrayGet($aOptions, 'empty_message', _kt("No folders or documents in this location."));
318 320 }
... ...
plugins/ktcore/KTColumns.inc.php
  View file @5b6352a
... ... @@ -143,7 +143,7 @@ class AdvancedDateColumn extends AdvancedColumn {
143 143 return array(null, null, null);
144 144 }
145 145 function addToDocumentQuery() {
146   - return array(null, null, $this->name);
  146 + return array(null, null, $this->document_sort_column);
147 147 }
148 148 }
149 149  
... ... @@ -422,4 +422,4 @@ class ContainingFolderColumn extends AdvancedColumn {
422 422 function getName() { return _kt('Opening Containing Folder'); }
423 423 }
424 424  
425   -?>
426 425 \ No newline at end of file
  426 +?>
... ...