diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-26 01:56:52 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-26 01:56:52 +0100 |
| commit | abad097016bf5243e9812f6a031f421a986b09f7 (patch) | |
| tree | f526a520a87db9c68ddd3436ce4bdb6f8c3182d1 /actionpack/lib/action_controller/metal/rendering.rb | |
| parent | 8974dac92e05dcab8ee552a5f40108c6ac25dc36 (diff) | |
| parent | c02391f8f97182e818d22a0f0ec4a5589d2fff15 (diff) | |
| download | rails-abad097016bf5243e9812f6a031f421a986b09f7.tar.gz rails-abad097016bf5243e9812f6a031f421a986b09f7.tar.bz2 rails-abad097016bf5243e9812f6a031f421a986b09f7.zip | |
Merge remote branch 'mikel/master'
Diffstat (limited to 'actionpack/lib/action_controller/metal/rendering.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index 72e2bbd00e..8f03035b2b 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -13,6 +13,10 @@ module ActionController end def render(*args) + if response_body + raise ::AbstractController::DoubleRenderError + end + args << {} unless args.last.is_a?(Hash) super(*args) self.content_type ||= args.last[:_template].mime_type.to_s |