[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46648] branches/10.x/lib/filegals/filegallib.php

[<ar...@us...>]

Revision: 46648
          http://sourceforge.net/p/tikiwiki/code/46648
Author:   arildb
Date:     2013-07-14 11:00:20 +0000 (Sun, 14 Jul 2013)
Log Message:
-----------
[bp/r46646][FIX] More solid fix for convertSortMode error return

Revision Links:
--------------
    http://sourceforge.net/p/tikiwiki/code/46646

Modified Paths:
--------------
    branches/10.x/lib/filegals/filegallib.php

Modified: branches/10.x/lib/filegals/filegallib.php
===================================================================
--- branches/10.x/lib/filegals/filegallib.php	2013-07-14 10:59:58 UTC (rev 46647)
+++ branches/10.x/lib/filegals/filegallib.php	2013-07-14 11:00:20 UTC (rev 46648)
@@ -2426,7 +2426,11 @@
 		$g_table = '`tiki_file_galleries` as tfg';
 		$f_group_by = '';
 		$orderby = $this->convertSortMode($sort_mode);
-
+		// order by must handle "1", which is the convertSortMode error return
+		if ( $orderby == '1' ) {
+			$orderby = '';
+		}
+		
 		$categlib = TikiLib::lib('categ');
 		$f2g_corresp = array(
 				'0 as `isgal`' => '1 as `isgal`',

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.