diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-07 12:40:14 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-07 12:40:14 +0000 |
| commit | c40b1a4a67ccaa3be31edb13399d93da0c628567 (patch) | |
| tree | 2c943fc5485bb29617911afd8da56bd269103bee /actionpack/lib/action_controller/rescue.rb | |
| parent | a3b045a73e729e44719713084462825ef98f8bc0 (diff) | |
| download | rails-c40b1a4a67ccaa3be31edb13399d93da0c628567.tar.gz rails-c40b1a4a67ccaa3be31edb13399d93da0c628567.tar.bz2 rails-c40b1a4a67ccaa3be31edb13399d93da0c628567.zip | |
Deprecate direct usage of @params. Update ActionView::Base for instance var deprecation.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4715 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 9b57d35587..7cd05eab32 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -79,7 +79,7 @@ module ActionController #:nodoc: begin perform_action_without_rescue rescue Object => exception - if defined?(Breakpoint) && @params["BP-RETRY"] + if defined?(Breakpoint) && params["BP-RETRY"] msg = exception.backtrace.first if md = /^(.+?):(\d+)(?::in `(.+)')?$/.match(msg) then origin_file, origin_line = md[1], md[2].to_i @@ -87,7 +87,7 @@ module ActionController #:nodoc: set_trace_func(lambda do |type, file, line, method, context, klass| if file == origin_file and line == origin_line then set_trace_func(nil) - @params["BP-RETRY"] = false + params["BP-RETRY"] = false callstack = caller callstack.slice!(0) if callstack.first["rescue.rb"] |