diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-29 16:49:26 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-29 17:51:05 +0100 |
| commit | 986a4e616be715e5c5a6ebbd25d339fa9bba4072 (patch) | |
| tree | 29f2051bc1f51785662035a1d4740d287ff817a0 /actionpack/lib/action_controller/metal | |
| parent | ba82eb2efa24c9124fc4b3dac65c7b7494022f99 (diff) | |
| download | rails-986a4e616be715e5c5a6ebbd25d339fa9bba4072.tar.gz rails-986a4e616be715e5c5a6ebbd25d339fa9bba4072.tar.bz2 rails-986a4e616be715e5c5a6ebbd25d339fa9bba4072.zip | |
Fix rendering of layouts.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index 8f03035b2b..0aae9f8579 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -58,11 +58,6 @@ module ActionController options.merge! :partial => action end - if (options.keys & [:partial, :file, :template, :text, :inline]).empty? - options[:_template_name] ||= options[:action] - options[:_prefix] = _prefix - end - if options[:status] options[:status] = Rack::Utils.status_code(options[:status]) end |