aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/filters.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-31 13:15:26 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-31 13:20:15 -0700
commita1eb4e11c2cccb91483fa15f1a1a0b2ae518d2cf (patch)
treeef09df0f7118b04e8964753b83499ccf027bba1a /actionpack/lib/action_controller/filters.rb
parente9a8e0053be3b293ab89fb584f1d660063f107aa (diff)
downloadrails-a1eb4e11c2cccb91483fa15f1a1a0b2ae518d2cf.tar.gz
rails-a1eb4e11c2cccb91483fa15f1a1a0b2ae518d2cf.tar.bz2
rails-a1eb4e11c2cccb91483fa15f1a1a0b2ae518d2cf.zip
Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, but it has since been removed from 1.9.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> Conflicts: actionpack/test/controller/layout_test.rb
Diffstat (limited to 'actionpack/lib/action_controller/filters.rb')
-rw-r--r--actionpack/lib/action_controller/filters.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb
index 1d7236f18a..9022b8b279 100644
--- a/actionpack/lib/action_controller/filters.rb
+++ b/actionpack/lib/action_controller/filters.rb
@@ -199,8 +199,8 @@ module ActionController #:nodoc:
Proc.new do |controller, action|
method.before(controller)
- if controller.send!(:performed?)
- controller.send!(:halt_filter_chain, method, :rendered_or_redirected)
+ if controller.__send__(:performed?)
+ controller.__send__(:halt_filter_chain, method, :rendered_or_redirected)
else
begin
action.call
@@ -223,8 +223,8 @@ module ActionController #:nodoc:
def call(controller, &block)
super
- if controller.send!(:performed?)
- controller.send!(:halt_filter_chain, method, :rendered_or_redirected)
+ if controller.__send__(:performed?)
+ controller.__send__(:halt_filter_chain, method, :rendered_or_redirected)
end
end
end