should solve all residual tag_query_limit bugs

This commit is contained in:
albert
2013-02-20 21:56:09 -05:00
parent 2f180036e2
commit e51631fbfa
8 changed files with 45 additions and 10 deletions

View File

@@ -210,7 +210,7 @@ class Tag < ActiveRecord::Base
output[:include] << tag[1..-1]
elsif tag =~ /\*/
matches = Tag.name_matches(tag).all(:select => "name", :limit => CurrentUser.user.tag_query_limit, :order => "post_count DESC").map(&:name)
matches = Tag.name_matches(tag).all(:select => "name", :limit => Danbooru.config.tag_query_limit, :order => "post_count DESC").map(&:name)
matches = ["~no_matches~"] if matches.empty?
output[:include] += matches

View File

@@ -416,9 +416,9 @@ class User < ActiveRecord::Base
def tag_query_limit
if is_privileged?
Danbooru.config.tag_query_limit
Danbooru.config.base_tag_query_limit
elsif is_platinum?
Danbooru.config.tag_query_limit * 2
Danbooru.config.base_tag_query_limit * 2
else
2
end