diff options
Diffstat (limited to 'actionpack/lib/action_controller/metal/rendering.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index a2d671486d..c8934b367f 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -56,10 +56,12 @@ module ActionController nil end - def _process_format(format) - super + def _get_content_type(rendered_format) + self.content_type || super + end - self.content_type ||= format.to_s + def _set_content_type(format) + self.content_type = format end # Normalize arguments by catching blocks and setting them on :update. |