diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-17 08:59:42 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-17 10:04:39 -0200 |
| commit | 0b7548fab17c8f50d9bc6ed7e98ef475d73010cc (patch) | |
| tree | cd50b47d30694c8b26f868546348a504894abe45 /actionpack/lib | |
| parent | cb650a50bfc561dc00dfc844dac01beeab05bd00 (diff) | |
| download | rails-0b7548fab17c8f50d9bc6ed7e98ef475d73010cc.tar.gz rails-0b7548fab17c8f50d9bc6ed7e98ef475d73010cc.tar.bz2 rails-0b7548fab17c8f50d9bc6ed7e98ef475d73010cc.zip | |
Move protected instance variables definition, kill compatibility module
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 7 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/compatibility.rb | 13 |
2 files changed, 5 insertions, 15 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index f570a7565c..3b82231b15 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -228,8 +228,11 @@ module ActionController include mod end - # Rails 2.x compatibility - include ActionController::Compatibility + # Define some internal variables that should not be propagated to the view. + self.protected_instance_variables = [ + :@_status, :@_headers, :@_params, :@_env, :@_response, :@_request, + :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout + ] ActiveSupport.run_load_hooks(:action_controller, self) end diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb deleted file mode 100644 index 0f43bc8cce..0000000000 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ /dev/null @@ -1,13 +0,0 @@ -module ActionController - module Compatibility - extend ActiveSupport::Concern - - # Temporary hax - included do - self.protected_instance_variables = [ - :@_status, :@_headers, :@_params, :@_env, :@_response, :@_request, - :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout - ] - end - end -end |