aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-25 10:21:50 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-25 10:22:51 -0300
commitb4239622afc4f3f73808fd0c97512f3a534e07dd (patch)
treea658495ba3fcea62356eb6b29ad53cafad84bc37 /actionpack/lib/action_view
parentf99ce3c188f5dde57e2ff63e6a22363c62f0a4cd (diff)
parent9a79c13c45b34c8bf338d341a421badeb4815c94 (diff)
downloadrails-b4239622afc4f3f73808fd0c97512f3a534e07dd.tar.gz
rails-b4239622afc4f3f73808fd0c97512f3a534e07dd.tar.bz2
rails-b4239622afc4f3f73808fd0c97512f3a534e07dd.zip
Merge pull request #10337 from eimermusic/fix_template_digestor_lookup
Fix ActionView::Digestor to correctly pass format to LookupContext Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/digestor.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/digestor.rb b/actionpack/lib/action_view/digestor.rb
index 9324a1ac50..6b9415e55d 100644
--- a/actionpack/lib/action_view/digestor.rb
+++ b/actionpack/lib/action_view/digestor.rb
@@ -57,7 +57,7 @@ module ActionView
end
def template
- @template ||= finder.find(logical_name, [], partial?, formats: [ format ])
+ @template ||= finder.find(logical_name, [], partial?, [], formats: [ format ])
end
def source