diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-10 23:14:47 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-10 23:14:47 +0000 |
| commit | 9aca06fbee44479eb8cccc5c19ecd8a85f0e0060 (patch) | |
| tree | 69a80ec50820bd4e40a1573cb50e9577f8d8dffb /actionpack/lib/action_controller | |
| parent | 18344e9b0e667b592c2990c25628738b2b161538 (diff) | |
| download | rails-9aca06fbee44479eb8cccc5c19ecd8a85f0e0060.tar.gz rails-9aca06fbee44479eb8cccc5c19ecd8a85f0e0060.tar.bz2 rails-9aca06fbee44479eb8cccc5c19ecd8a85f0e0060.zip | |
More Action View refactoring. Knock :erb default down a notch. Closes #10455.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8374 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index f1d416d664..ff77e036fb 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -862,7 +862,7 @@ module ActionController #:nodoc: elsif inline = options[:inline] add_variables_to_assigns - render_for_text(@template.render_template(options[:type] || :erb, inline, nil, options[:locals] || {}), options[:status]) + render_for_text(@template.render_template(options[:type], inline, nil, options[:locals] || {}), options[:status]) elsif action_name = options[:action] template = default_template_name(action_name.to_s) |