diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index cd8b075fd2..6756e271bf 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed some deprecation warnings in ActionPack [Rick Olson] + * assert_select_rjs decodes escaped unicode chars since the Javascript generators encode them. #6240 [japgolly] * Deprecation: @cookies, @headers, @request, @response will be removed after 1.2. Use the corresponding method instead. [Jeremy Kemper] diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index e7782d3e22..fa45b46e05 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -135,7 +135,7 @@ module ActionController #:nodoc: private def caching_allowed - !@request.post? && response.headers['Status'] && response.headers['Status'].to_i < 400 + !request.post? && response.headers['Status'] && response.headers['Status'].to_i < 400 end end @@ -559,8 +559,7 @@ module ActionController #:nodoc: return unless perform_caching configuration = sweepers.last.is_a?(Hash) ? sweepers.pop : {} sweepers.each do |sweeper| - observer(sweeper) - + ActiveRecord::Base.observers << sweeper if defined?(ActiveRecord) and defined?(ActiveRecord::Base) sweeper_instance = Object.const_get(Inflector.classify(sweeper)).instance if sweeper_instance.is_a?(Sweeper) diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index b7df9fd125..34014bfd38 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -59,7 +59,7 @@ module ActionController #:nodoc: # the remote IP being 127.0.0.1. For example, this could include the IP of the developer machine when debugging # remotely. def local_request? #:doc: - [@request.remote_addr, @request.remote_ip] == ["127.0.0.1"] * 2 + [request.remote_addr, request.remote_ip] == ["127.0.0.1"] * 2 end # Renders a detailed diagnostics screen on action exceptions. |