# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1417252032 -7200
# Node ID 9c7e91d813a016247c94ac2b1043d4fa29bdcc6b
# Parent  0c11b391007b378406c5ea08c1cea8022a429e4d# Parent  c1738ee91f6a147b0f044c5a5288c3c622ada43d
Merged.

diff -r 0c11b391007b -r 9c7e91d813a0 pages/vote.inc.php
--- a/pages/vote.inc.php	Sat Nov 29 11:03:08 2014 +0200
+++ b/pages/vote.inc.php	Sat Nov 29 11:07:12 2014 +0200
@@ -121,7 +121,7 @@
 
   foreach (stExecSQL("SELECT * FROM compos WHERE visible<>0 AND voting<>0") as $compo)
   {
-    $esql = stPrepareSQL("FROM entries WHERE (flags & %d)=0 AND compo_id=%d ORDER BY show_id ASC", EFLAG_DISQUALIFIED, $compo["id"]);
+    $esql = stPrepareSQL("FROM entries WHERE (flags & %d)=0 AND compo_id=%d", EFLAG_DISQUALIFIED, $compo["id"]);
     $nentries = stFetchSQLColumn("SELECT COUNT(*) ".$esql);
     if ($nentries > 0)
     {
@@ -138,7 +138,7 @@
       "  </tr>\n";
 
       $row = 0;
-      foreach (stExecSQL("SELECT * ".$esql) as $entry)
+      foreach (stExecSQL("SELECT * ".$esql." ORDER BY show_id ASC") as $entry)
       {
         $eid = $entry["id"];
         echo