From 77124bb889a4a372da285455efa57cb8e58ddba4 Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 20 Feb 2013 22:08:21 -0500 Subject: [PATCH] fast_count fixes --- app/models/post.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/post.rb b/app/models/post.rb index 62b8e2217..8cf3f3a2b 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -570,7 +570,7 @@ class Post < ActiveRecord::Base def get_count_from_cache(tags) count = Cache.get(count_cache_key(tags)) - if count.nil? && tags.to_s !~ /^(?:#{Tag::METATAGS}):/ + if count.nil? && tags.to_s !~ /(?:#{Tag::METATAGS}):/ count = select_value_sql("SELECT post_count FROM tags WHERE name = ?", tags.to_s) end @@ -613,11 +613,11 @@ class Post < ActiveRecord::Base def fast_count_search(tags) count = Post.with_timeout(500, Danbooru.config.blank_tag_search_fast_count || 1_000_000) do - Post.tag_match(tags).undeleted.count + Post.tag_match(tags).count end if count == 0 - count = Post.tag_match(tags).undeleted.count + count = Post.tag_match(tags).count end if count > Danbooru.config.posts_per_page * 10