Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -N -r1025 -r1063
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 1025)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 1063)
@@ -2825,15 +2825,16 @@
         	$LoadOnlyPrimary = false;
         }
         
-        $sql .= $this->GetJoinedSQL($p,NULL,$where, $LoadOnlyPrimary);               
-        $sql .= " ORDER BY EdPick DESC,Relevance DESC ";
-        
-        $tmp = $this->QueryOrderByClause(FALSE,TRUE,TRUE);
-        $tmp = substr($tmp,9);
+        $sql .= $this->GetJoinedSQL($p,NULL,$where, $LoadOnlyPrimary);              
+        $tmp = $this->QueryOrderByClause(FALSE,TRUE,TRUE);        
+        //echo "TMP: $tmp<br>";
+        //$tmp = substr($tmp,9);
         if(strlen($tmp))
         {
-        	$sql .= ", ".$tmp." ";
-        }
+        	$sql .= $tmp.", ";
+        }        
+        
+        $sql .= " EdPick DESC,Relevance DESC ";        
         //echo "SQL Search Items: $sql<br><br>";
 		return $sql;    	
     }
Index: trunk/kernel/parser.php
===================================================================
diff -u -N -r1041 -r1063
--- trunk/kernel/parser.php	(.../parser.php)	(revision 1041)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 1063)
@@ -1634,14 +1634,20 @@
     }
     else
         $acl_where = "(FIND_IN_SET(0,acl))";
+        
+    $order_by = "EdPick DESC,Relevance DESC";
+    
+    if ($objSession->GetVariable("Category_Sortfield") != "") {
+    	$order_by = $objSession->GetVariable("Category_Sortfield")." ".$objSession->GetVariable("Category_Sortorder");
+    }
 
     $CAT_VIEW = $objPermissions->GetPermId("CATEGORY.VIEW");
     $ctable = $objCatList->SourceTable;
     $stable = $objSession->GetSearchTable(); // $objSearchCats->SourceTable;
     $ptable = GetTablePrefix()."PermCache";
     $sql = "SELECT * FROM $stable INNER JOIN $ctable ON ($stable.ItemId=$ctable.CategoryId) ";
     $sql .= "INNER JOIN $ptable ON ($ctable.CategoryId=$ptable.CategoryId) ";
-    $sql .="WHERE ItemType=1 AND Status=1 AND $acl_where AND PermId=$CAT_VIEW ORDER BY EdPick DESC,Relevance DESC ";
+    $sql .="WHERE ItemType=1 AND Status=1 AND $acl_where AND PermId=$CAT_VIEW ORDER BY $order_by ";
     $objSearchCats->Page = $m_var_list["p"];
     if($objSearchCats->Page<1)
         $objSearchCats->Page=1;