mir/moebooru
2
0
Fork 0
mirror of https://github.com/moebooru/moebooru synced 2025-08-31 14:05:14 +00:00
Code Issues Releases Wiki Activity

fix q[:order] creates an empty :order, breaking things if the same query is used more than once

Browse Source 
--HG--
branch : moe
extra : convert_revision : svn%3A2d28d66d-8d94-df11-8c86-00306ef368cb/trunk/moe%40454
This commit is contained in:
petopeto
2010-11-18 20:10:19 +00:00
parent 88dec31207
commit 47716b802a
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/models/post/sql_methods.rb
View File

@@ -279,7 +279,7 @@ module PostSqlMethods
sql << " FROM " + joins.join(" ")
sql << " WHERE " + conds.join(" AND ")
if q[:order] && !options[:count]
if q.has_key?(:order) && !options[:count]
case q[:order]
when "id"
sql << " ORDER BY p.id"
@@ -327,15 +327,21 @@ module PostSqlMethods
sql << " ORDER BY random"
else
if pool_ordering
sql << pool_ordering
use_default_order = true
end
else
use_default_order = true
end
if use_default_order && !options[:count] then
if pool_ordering
sql << pool_ordering
else
if options[:from_api] then
# When using the API, default to sorting by ID.
sql << " ORDER BY p.id DESC"
else
if options[:from_api] then
# When using the API, default to sorting by ID.
sql << " ORDER BY p.id DESC"
else
sql << " ORDER BY p.index_timestamp DESC"
end
sql << " ORDER BY p.index_timestamp DESC"
end
end
end