From 83c8db981892820b747390d854595268afade8dd Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 13 Mar 2007 03:49:52 +0000 Subject: Deprecation: remove deprecated instance variables. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6399 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/base.rb | 4 ++-- actionpack/lib/action_view/template_error.rb | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'actionpack/lib/action_view') diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index d66b43cd68..9956e0fe28 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -157,7 +157,7 @@ module ActionView #:nodoc: attr_accessor :controller attr_reader :logger, :response, :headers - attr_internal(*ActionController::Base::DEPRECATED_INSTANCE_VARIABLES) + attr_internal :cookies, :flash, :headers, :params, :request, :response, :session # Specify trim mode for the ERB compiler. Defaults to '-'. # See ERB documentation for suitable values. @@ -555,4 +555,4 @@ module ActionView #:nodoc: end end -require 'action_view/template_error' \ No newline at end of file +require 'action_view/template_error' diff --git a/actionpack/lib/action_view/template_error.rb b/actionpack/lib/action_view/template_error.rb index 546db41f08..34ed50ae9a 100644 --- a/actionpack/lib/action_view/template_error.rb +++ b/actionpack/lib/action_view/template_error.rb @@ -10,8 +10,6 @@ module ActionView @base_path, @assigns, @source, @original_exception = base_path, assigns.dup, source, original_exception @file_path = file_path - - remove_deprecated_assigns! end def message @@ -82,12 +80,6 @@ module ActionView end private - def remove_deprecated_assigns! - ActionController::Base::DEPRECATED_INSTANCE_VARIABLES.each do |ivar| - @assigns.delete(ivar) - end - end - def strip_base_path(path) File.expand_path(path). gsub(/^#{Regexp.escape File.expand_path(RAILS_ROOT)}/, ''). -- cgit v1.2.3