aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-03-13 03:49:52 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-03-13 03:49:52 +0000
commit83c8db981892820b747390d854595268afade8dd (patch)
treeacd18fb1a33668e50d754133c1f904317b49fdb2 /actionpack/lib/action_view
parent9c0fe36d461264552198cdde493e91bd7c26c57c (diff)
downloadrails-83c8db981892820b747390d854595268afade8dd.tar.gz
rails-83c8db981892820b747390d854595268afade8dd.tar.bz2
rails-83c8db981892820b747390d854595268afade8dd.zip
Deprecation: remove deprecated instance variables.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6399 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/base.rb4
-rw-r--r--actionpack/lib/action_view/template_error.rb8
2 files changed, 2 insertions, 10 deletions
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)}/, '').