X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fbabed694b5acae64c8baf633ab17d1e61010370..2dd89f2d0806b249287d19e63e4392e6d21a847b:/app/models/user_block.rb

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 2cf0eefc4..d8fa95cb2 100644
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -4,8 +4,6 @@ class UserBlock < ActiveRecord::Base
   belongs_to :user, :class_name => "User", :foreign_key => :user_id
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
   belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id
-  
-  after_initialize :set_defaults
 
   PERIODS = USER_BLOCK_PERIODS
 
@@ -32,21 +30,15 @@ class UserBlock < ActiveRecord::Base
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.
   def revoke!(revoker)
-    update_attributes({
+    update_attributes(
       :ends_at => Time.now.getutc(),
       :revoker_id => revoker.id,
       :needs_view => false
-    }, :without_protection => true)
+    )
   end
 
 private
 
-  ##
-  # set default values for new records.
-  def set_defaults
-    self.reason_format = "markdown" unless self.attribute_present?(:reason_format)
-  end
-
   ##
   # validate that only moderators are allowed to change the
   # block. this should be caught and dealt with in the controller,