aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/template/resolver.rb
diff options
context:
space:
mode:
authorJohn Hawthorn <john@hawthorn.email>2019-02-25 19:33:50 -0800
committerJohn Hawthorn <john@hawthorn.email>2019-02-26 16:59:04 -0800
commitc2145462178d2b28135fac38ebbceeaadfa151df (patch)
treeebad7770e18f73949b1a75e32fdbaa5892d9f908 /actionview/lib/action_view/template/resolver.rb
parentff4b2cf2410286e75b2ad41c9733ef41f65fba15 (diff)
downloadrails-c2145462178d2b28135fac38ebbceeaadfa151df.tar.gz
rails-c2145462178d2b28135fac38ebbceeaadfa151df.tar.bz2
rails-c2145462178d2b28135fac38ebbceeaadfa151df.zip
Create templates with format=nil
Diffstat (limited to 'actionview/lib/action_view/template/resolver.rb')
-rw-r--r--actionview/lib/action_view/template/resolver.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb
index 1c463efbb2..f2b8b1166d 100644
--- a/actionview/lib/action_view/template/resolver.rb
+++ b/actionview/lib/action_view/template/resolver.rb
@@ -294,12 +294,12 @@ module ActionView
if handler.respond_to?(:default_format) # default_format can return nil
handler.default_format
else
- query_format
+ nil
end
end
# Template::Types[format] and handler.default_format can return nil
- [handler, format || query_format, variant]
+ [handler, format, variant]
end
end