Mercurial > hg > fapweb
changeset 974:9c7e91d813a0
Merged.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sat, 29 Nov 2014 11:07:12 +0200 |
parents | 0c11b391007b (current diff) c1738ee91f6a (diff) |
children | 38936f77856e |
files | |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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