diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-02-06 04:26:40 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-02-06 04:26:40 +0000 |
| commit | 692dbbf79387b56e241e1acd05f74f7d71ff79a6 (patch) | |
| tree | 7d1c1c9f7a8baa517b525a0d02821fd47ca34daf /actionpack/lib/action_controller/base.rb | |
| parent | 8bc9018882c55cea06d062a9d2d4a32f92b2dc47 (diff) | |
| download | rails-692dbbf79387b56e241e1acd05f74f7d71ff79a6.tar.gz rails-692dbbf79387b56e241e1acd05f74f7d71ff79a6.tar.bz2 rails-692dbbf79387b56e241e1acd05f74f7d71ff79a6.zip | |
Introduce a Template class to ActionView. Closes #11024 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8805 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 1321b002eb..34c3ed3a60 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -5,6 +5,7 @@ require 'action_controller/routing' require 'action_controller/resources' require 'action_controller/url_rewriter' require 'action_controller/status_codes' +require 'action_view/template' require 'action_view/template_finder' require 'drb' require 'set' @@ -866,7 +867,8 @@ module ActionController #:nodoc: elsif inline = options[:inline] add_variables_to_assigns - render_for_text(@template.render_template(options[:type], inline, nil, options[:locals] || {}), options[:status]) + tmpl = ActionView::Template.new(@template, options[:inline], false, options[:locals], true, options[:type]) + render_for_text(@template.render_template(tmpl), options[:status]) elsif action_name = options[:action] template = default_template_name(action_name.to_s) |