aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/mime_responds.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-02-21 23:55:56 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2012-02-22 11:13:02 -0200
commit19433ce8701d9ff2b311d0a2ec98be366ce461ea (patch)
treea2acdc41ab925c64d98b7944b3ff2d3928bb2412 /actionpack/lib/action_controller/metal/mime_responds.rb
parent35626feb61e260ec704ed407768da4c6a2f27a47 (diff)
downloadrails-19433ce8701d9ff2b311d0a2ec98be366ce461ea.tar.gz
rails-19433ce8701d9ff2b311d0a2ec98be366ce461ea.tar.bz2
rails-19433ce8701d9ff2b311d0a2ec98be366ce461ea.zip
format lookup for partials is derived from the format in which the template is being rendered
Closes #5025 part 2
Diffstat (limited to 'actionpack/lib/action_controller/metal/mime_responds.rb')
-rw-r--r--actionpack/lib/action_controller/metal/mime_responds.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 80ecc16d53..55de7e7d8e 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -280,7 +280,7 @@ module ActionController #:nodoc:
if format
self.content_type ||= format.to_s
- lookup_context.freeze_formats([format.to_sym])
+ lookup_context.formats = [format.to_sym]
collector
else
head :not_acceptable