aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2013-06-04 12:45:15 -0700
committerDavid Heinemeier Hansson <david@loudthinking.com>2013-06-04 12:45:15 -0700
commit95296f1a7a2ae0490546c0d3010fc435558911c8 (patch)
tree5d8de3cec11e9cf69824fd06c02030fe6dfb87d3 /actionpack/lib
parentbc8f8026232bdc55ebed24d8326a863036b816fd (diff)
parent2a576dd257647871660c3e86f0c4fcddbb5b7105 (diff)
downloadrails-95296f1a7a2ae0490546c0d3010fc435558911c8.tar.gz
rails-95296f1a7a2ae0490546c0d3010fc435558911c8.tar.bz2
rails-95296f1a7a2ae0490546c0d3010fc435558911c8.zip
Merge pull request #10841 from latortuga/fix-underscore-dependency-tracking
Fix mismatching variable names when using an underscore
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/dependency_tracker.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/dependency_tracker.rb b/actionpack/lib/action_view/dependency_tracker.rb
index 45d17be605..b2e8334077 100644
--- a/actionpack/lib/action_view/dependency_tracker.rb
+++ b/actionpack/lib/action_view/dependency_tracker.rb
@@ -74,7 +74,7 @@ module ActionView
# render(@topic) => render("topics/topic")
# render(topics) => render("topics/topic")
# render(message.topics) => render("topics/topic")
- collect { |name| name.sub(/\A@?([a-z]+\.)*([a-z_]+)\z/) { "#{$2.pluralize}/#{$2.singularize}" } }.
+ collect { |name| name.sub(/\A@?([a-z_]+\.)*([a-z_]+)\z/) { "#{$2.pluralize}/#{$2.singularize}" } }.
# render("headline") => render("message/headline")
collect { |name| name.include?("/") ? name : "#{directory}/#{name}" }.