diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-05-26 15:19:39 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-05-26 15:19:39 -0700 |
| commit | 7211048b2b1d640c4f33587b57261bdfe9c77b93 (patch) | |
| tree | 4b0cfb4959eeb50280793e4f6354a3bda2cae6b9 /actionpack/lib/action_controller/new_base/base.rb | |
| parent | a1f280e83d2b134e23897d4de457d76fb0095768 (diff) | |
| download | rails-7211048b2b1d640c4f33587b57261bdfe9c77b93.tar.gz rails-7211048b2b1d640c4f33587b57261bdfe9c77b93.tar.bz2 rails-7211048b2b1d640c4f33587b57261bdfe9c77b93.zip | |
Get all template tests passing on new base
Diffstat (limited to 'actionpack/lib/action_controller/new_base/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb index ffe608ade4..3477fc0403 100644 --- a/actionpack/lib/action_controller/new_base/base.rb +++ b/actionpack/lib/action_controller/new_base/base.rb @@ -40,7 +40,7 @@ module ActionController module ImplicitRender def process_action(method_name) ret = super - default_render if response_body.nil? + default_render unless performed? ret end |