diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-29 07:34:02 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-29 07:34:02 +0000 |
| commit | d7674637f9ac7c9764a4fe09dbc15ee239ce5a77 (patch) | |
| tree | a1e89ae8634b906244a3a37680c22e7dec38ea61 /actionpack/lib/action_view/base.rb | |
| parent | c0eccc9aef21c3eac9d89d3af93b82ce906b04dd (diff) | |
| download | rails-d7674637f9ac7c9764a4fe09dbc15ee239ce5a77.tar.gz rails-d7674637f9ac7c9764a4fe09dbc15ee239ce5a77.tar.bz2 rails-d7674637f9ac7c9764a4fe09dbc15ee239ce5a77.zip | |
Deprecation: @request will be removed after 1.2. Use the request method instead.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5201 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 5d1bf57c94..53811d8e9d 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -147,8 +147,8 @@ module ActionView #:nodoc: attr_accessor :base_path, :assigns, :template_extension attr_accessor :controller - attr_reader :logger, :request, :response, :headers - attr_internal :flash, :params, :session + attr_reader :logger, :response, :headers + attr_internal *ActionController::Base::DEPRECATED_INSTANCE_VARIABLES # Specify trim mode for the ERB compiler. Defaults to '-'. # See ERB documentation for suitable values. @@ -440,11 +440,11 @@ module ActionView #:nodoc: if template_requires_setup?(extension) body = case extension.to_sym when :rxml - "@controller.response.content_type ||= 'application/xml'\n" + + "controller.response.content_type ||= 'application/xml'\n" + "xml = Builder::XmlMarkup.new(:indent => 2)\n" + template when :rjs - "@controller.response.content_type ||= 'text/javascript'\n" + + "controller.response.content_type ||= 'text/javascript'\n" + "update_page do |page|\n#{template}\nend" end else @@ -525,4 +525,4 @@ module ActionView #:nodoc: end end -require 'action_view/template_error'
\ No newline at end of file +require 'action_view/template_error' |