vendor/rails/actionpack/lib/action_controller/verification.rb in radiant-0.7.2 vs vendor/rails/actionpack/lib/action_controller/verification.rb in radiant-0.8.0

@@ -78,21 +78,21 @@
       # <tt>:except</tt>:: 
       #   do not apply this verification to the actions specified in the associated 
       #   array (may also be a single value).
       def verify(options={})
         before_filter :only => options[:only], :except => options[:except] do |c|
-          c.send! :verify_action, options
+          c.__send__ :verify_action, options
         end
       end
     end
 
   private
 
     def verify_action(options) #:nodoc:
       if prereqs_invalid?(options)
         flash.update(options[:add_flash])              if options[:add_flash]
-        response.headers.update(options[:add_headers]) if options[:add_headers]
+        response.headers.merge!(options[:add_headers]) if options[:add_headers]
         apply_remaining_actions(options)               unless performed?
       end
     end
     
     def prereqs_invalid?(options) # :nodoc:
@@ -114,10 +114,10 @@
     def verify_request_xhr_status(options) # :nodoc:
       request.xhr? != options[:xhr] unless options[:xhr].nil?
     end
     
     def apply_redirect_to(redirect_to_option) # :nodoc:
-      (redirect_to_option.is_a?(Symbol) && redirect_to_option != :back) ? self.send!(redirect_to_option) : redirect_to_option
+      (redirect_to_option.is_a?(Symbol) && redirect_to_option != :back) ? self.__send__(redirect_to_option) : redirect_to_option
     end
     
     def apply_remaining_actions(options) # :nodoc:
       case
         when options[:render]      ; render(options[:render])
\ No newline at end of file