Merge pull request Fabrik#1291 from trob/j3_oo

list order by is breaking if order by is "unset"
parsec71 · Aug 11, 2014 · 9ca7712 · 9ca7712
2 parents 4f6b4b0 + 69bfe9d
commit 9ca7712
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/components/com_fabrik/models/list.php b/components/com_fabrik/models/list.php
@@ -2800,12 +2800,12 @@ public function buildQueryOrder($query = false)
 					$dir = JArrayHelper::getValue($orderdirs, $o, 'desc');
 
 					// as we use getString() for query string, need to sanitize
-					if (!in_array(strtolower($dir), array('asc', 'desc')))
+					if (!in_array(strtolower($dir), array('asc', 'desc','-')))
 					{
 						throw new ErrorException('invalid order direction: ' . $dir, 500);
 					}
 
-					if ($orderbyRaw !== '')
+					if ($orderbyRaw !== '' && $dir != '-')
 					{
 						// $$$ hugh - getOrderByName can return a CONCAT, ie join element ...