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

2013-04-16 21:12:26 -07:00
parent 044708f3cf 64eeab3396
commit 80cf4d2475
4 changed files with 12 additions and 2 deletions
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -190,7 +190,7 @@ class Tag < ActiveRecord::Base
        end

      when :age
-        object =~ /(\d+)(s(econds?)?|mi(nutes?)?|h(ours?)?|d(ays?)?|w(eeks?)?|mo(nths?)?|y(ears?)?)/i
+        object =~ /(\d+)(s(econds?)?|mi(nutes?)?|h(ours?)?|d(ays?)?|w(eeks?)?|mo(nths?)?|y(ears?)?)?/i

        size = $1.to_i
        unit = $2