diff options
author | Joshua Peek <josh@joshpeek.com> | 2010-01-22 10:18:19 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2010-01-22 10:19:01 -0600 |
commit | 1a750da130223867195503d284cf4c73a345eee5 (patch) | |
tree | c73815d1d84e8c1f4bceb2e86fea458ea5c3abf1 /actionpack/lib/action_view/base.rb | |
parent | 4afd9702fe111a5cbaa0d9572e7661c90b188d49 (diff) | |
download | rails-1a750da130223867195503d284cf4c73a345eee5.tar.gz rails-1a750da130223867195503d284cf4c73a345eee5.tar.bz2 rails-1a750da130223867195503d284cf4c73a345eee5.zip |
Make @controller an internal ivar in the view
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 4970c768e8..c4b0455c2a 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -181,7 +181,6 @@ module ActionView #:nodoc: extend ActiveSupport::Memoizable attr_accessor :base_path, :assigns, :template_extension, :formats - attr_accessor :controller attr_internal :captures def reset_formats(formats) @@ -277,13 +276,13 @@ module ActionView #:nodoc: @config = nil @formats = formats @assigns = assigns_for_first_render.each { |key, value| instance_variable_set("@#{key}", value) } - @controller = controller + @_controller = controller @helpers = self.class.helpers || Module.new @_content_for = Hash.new {|h,k| h[k] = ActionView::SafeBuffer.new } self.view_paths = view_paths end - attr_internal :template + attr_internal :controller, :template attr_reader :view_paths def view_paths=(paths) @@ -298,12 +297,11 @@ module ActionView #:nodoc: # Evaluates the local assigns and controller ivars, pushes them to the view. def _evaluate_assigns_and_ivars #:nodoc: - if @controller - variables = @controller.instance_variable_names - variables -= @controller.protected_instance_variables if @controller.respond_to?(:protected_instance_variables) - variables.each { |name| instance_variable_set(name, @controller.instance_variable_get(name)) } + if controller + variables = controller.instance_variable_names + variables -= controller.protected_instance_variables if controller.respond_to?(:protected_instance_variables) + variables.each { |name| instance_variable_set(name, controller.instance_variable_get(name)) } end end - end end |