appdb/include testData.php

[WineHQ]

ChangeSet ID:	31168
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	wineowner at winehq.org	2007/06/09 19:14:03

Modified files:
	include        : testData.php 

Log message:
	Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
	Sort testData by id

Patch: http://cvs.winehq.org/patch.py?id=31168

Old revision  New revision  Changes     Path
 1.55          1.56          +6 -6       appdb/include/testData.php

Index: appdb/include/testData.php
diff -u -p appdb/include/testData.php:1.55 appdb/include/testData.php:1.56
--- appdb/include/testData.php:1.55	10 Jun 2007  0:14: 3 -0000
+++ appdb/include/testData.php	10 Jun 2007  0:14: 3 -0000
@@ -828,7 +828,7 @@ class testData{
         return $oRow->count;
     }
 
-    function objectGetEntries($bQueued, $bRejected)
+    function objectGetEntries($bQueued, $bRejected, $sOrderBy = "testingId")
     {
         $oTest = new testData();
         $sQueued = objectManager::getQueueString($bQueued, $bRejected);
@@ -843,7 +843,7 @@ class testData{
                         AND
                         testResults.submitterId = '?'
                         AND
-                        testResults.queued = '?'";
+                        testResults.queued = '?' ORDER BY '?'";
             } else
             {
                 $sQuery = "SELECT testResults.* FROM testResults, appVersion,
@@ -868,10 +868,10 @@ class testData{
                                 )
                             )
                             AND
-                            testResults.queued = '?'";
+                            testResults.queued = '?' ORDER BY '?'";
             }
             $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId,
-                                        $sQueued);
+                                        $sQueued, $sOrderBy);
         } else
         {
             $sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE
@@ -879,8 +879,8 @@ class testData{
                     AND
                     appVersion.queued = 'false'
                     AND
-                    testResults.queued = '?' ORDER by testingId";
-            $hResult = query_parameters($sQuery, $sQueued);
+                    testResults.queued = '?' ORDER by '?'";
+            $hResult = query_parameters($sQuery, $sQueued, $sOrderBy);
         }
 
         if(!$hResult)