Merge pull request #3391 from evazion/fix-3390

Fix #3390: Searching certain metatags results in an empty paginator

app/models/post.rb

@@ -1218,14 +1218,14 @@ class Post < ApplicationRecord
     end
 
     def get_count_from_cache(tags)
-      count = Cache.get(count_cache_key(tags)) # this will only have a value for multi-tag searches
-
-      if count.nil? && !tags.include?(" ")
+      if Tag.is_simple_tag?(tags)
         count = select_value_sql("SELECT post_count FROM tags WHERE name = ?", tags.to_s)
-        # set_count_in_cache(tags, count.to_i) if count
+      else
+        # this will only have a value for multi-tag searches or single metatag searches
+        count = Cache.get(count_cache_key(tags))
       end
 
-      count ? count.to_i : nil
+      count.try(:to_i)
     end
 
     def set_count_in_cache(tags, count, expiry = nil)

app/models/tag.rb

@@ -415,6 +415,12 @@ class Tag < ApplicationRecord
       end
     end
 
+    # true if query is a single "simple" tag (not a metatag, negated tag, or wildcard tag).
+    def is_simple_tag?(query)
+      q = parse_query(query)
+      (scan_query(query).size == 1) && (q[:tags][:related].size == 1)
+    end
+
     def parse_query(query, options = {})
       q = {}
 
@@ -783,6 +789,10 @@ class Tag < ApplicationRecord
   end
 
   module SearchMethods
+    def empty
+      where("tags.post_count <= 0")
+    end
+
     def nonempty
       where("tags.post_count > 0")
     end