diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-31 14:32:26 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-31 14:32:26 +0000 |
| commit | ed60021f39f7913537dcad181e4061e423dc6c3d (patch) | |
| tree | 86532c43aabe9125422f84b48a899f2672900bf5 /actionpack/lib/action_controller/metal/rendering.rb | |
| parent | c6af337d2d6c86792cdc8132224ebe9294d35774 (diff) | |
| parent | b3a028259f373fd58fea2171a1e9e8b2fe3e253a (diff) | |
| download | rails-ed60021f39f7913537dcad181e4061e423dc6c3d.tar.gz rails-ed60021f39f7913537dcad181e4061e423dc6c3d.tar.bz2 rails-ed60021f39f7913537dcad181e4061e423dc6c3d.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activemodel/lib/active_model/state_machine.rb
Diffstat (limited to 'actionpack/lib/action_controller/metal/rendering.rb')
| -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 |