diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-03 02:34:11 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-03 02:34:11 -0500 |
| commit | 9ed3aab6927471078888ff51c255561350946344 (patch) | |
| tree | 337d71804afb740c0def41359239186fcb28317b /actionpack/lib/action_controller | |
| parent | c48a0cac626b4e32d7abfa9f4f1fae16568157d9 (diff) | |
| parent | 43962d6ec50f918c9970bd3cd4b6ee5c7f7426ed (diff) | |
| download | rails-9ed3aab6927471078888ff51c255561350946344.tar.gz rails-9ed3aab6927471078888ff51c255561350946344.tar.bz2 rails-9ed3aab6927471078888ff51c255561350946344.zip | |
Merge branch 'format_localized_template' of https://github.com/acapilleri/rails
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index 5c48b4ab98..cb2965abac 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -34,7 +34,7 @@ module ActionController def _process_format(format) super - self.content_type ||= format.to_s + self.content_type ||= format.to_s unless format.nil? #here test if format is Mime::NullTye istance, no if is a NillClass or FalseClass end # Normalize arguments by catching blocks and setting them on :update. |