revert testing changes

2011-11-18 18:09:23 -05:00
parent 46236e32a5
commit 1d4ce259a8
4 changed files with 10 additions and 7 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -328,7 +328,7 @@ class User < ActiveRecord::Base
    def can_upload?
      if is_contributor?
        true
-      elsif false && created_at > 1.week.ago
+      elsif created_at > 1.week.ago
        false
      else
        upload_limit > 0
@@ -338,7 +338,7 @@ class User < ActiveRecord::Base
    def can_comment?
      if is_privileged?
        true
-      elsif false && created_at > 1.week.ago
+      elsif created_at > 1.week.ago
        false
      else
        Comment.where("creator_id = ? and created_at > ?", id, 1.hour.ago).count < Danbooru.config.member_comment_limit