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

2013-05-06 12:54:36 -07:00
parent 1ce7953730 dcd00a52a1
commit b11001519f
4 changed files with 13 additions and 6 deletions
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -76,7 +76,7 @@ class Tag < ActiveRecord::Base
        end
      end

-      def categories_for(tag_names, options)
+      def categories_for(tag_names, options = {})
        Array(tag_names).inject({}) do |hash, tag_name|
          hash[tag_name] = category_for(tag_name, options)
          hash