Merge branch 'master' of github.com:r888888888/danbooru

2013-05-13 10:45:42 -07:00
parent e3493f6cd3 fcd450b2fd
commit 3ea4b8daaf
30 changed files with 168 additions and 70 deletions
--- a/app/logical/post_sets/post.rb
+++ b/app/logical/post_sets/post.rb
@@ -69,10 +69,6 @@ module PostSets
      tag_string =~ /\*/
    end

-    def is_empty_search?
-      posts.count == 0
-    end
-
    def current_page
      [page.to_i, 1].max
    end
--- a/app/logical/post_sets/wiki_page.rb
+++ b/app/logical/post_sets/wiki_page.rb
@@ -2,7 +2,7 @@ module PostSets
  class SearchError < Exception
  end

-  class WikiPage < Post
+  class WikiPage < PostSets::Post
    def presenter
      @presenter ||= ::PostSetPresenters::WikiPage.new(self)
    end