aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/rendering.rb
diff options
context:
space:
mode:
authorSergey Nartimov <just.lest@gmail.com>2012-01-07 14:44:47 +0300
committerSergey Nartimov <just.lest@gmail.com>2012-01-07 14:44:47 +0300
commit7d862359d0ebe8c173ef2e069dcbf2c69f43d798 (patch)
tree551a9c764b0f182602a59abcac286c95a0f627c0 /actionpack/lib/abstract_controller/rendering.rb
parentba168e8f067d72f7a21691f4cfdcd40432135246 (diff)
downloadrails-7d862359d0ebe8c173ef2e069dcbf2c69f43d798.tar.gz
rails-7d862359d0ebe8c173ef2e069dcbf2c69f43d798.tar.bz2
rails-7d862359d0ebe8c173ef2e069dcbf2c69f43d798.zip
get rid of using instance_variable_names method from AS
- instance_variables return symbols in 1.9 - there is instance_variable_defined? method
Diffstat (limited to 'actionpack/lib/abstract_controller/rendering.rb')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 9019c07bca..3619ef5cf5 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -1,6 +1,5 @@
require "abstract_controller/base"
require "action_view"
-require "active_support/core_ext/object/instance_variables"
module AbstractController
class DoubleRenderError < Error
@@ -109,17 +108,17 @@ module AbstractController
view_renderer.render(view_context, options)
end
- DEFAULT_PROTECTED_INSTANCE_VARIABLES = %w(
- @_action_name @_response_body @_formats @_prefixes @_config
- @_view_context_class @_view_renderer @_lookup_context
- )
+ DEFAULT_PROTECTED_INSTANCE_VARIABLES = [
+ :@_action_name, :@_response_body, :@_formats, :@_prefixes, :@_config,
+ :@_view_context_class, :@_view_renderer, :@_lookup_context
+ ]
# This method should return a hash with assigns.
# You can overwrite this configuration per controller.
# :api: public
def view_assigns
hash = {}
- variables = instance_variable_names
+ variables = instance_variables
variables -= protected_instance_variables
variables -= DEFAULT_PROTECTED_INSTANCE_VARIABLES
variables.each { |name| hash[name.to_s[1, name.length]] = instance_variable_get(name) }