diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2016-03-04 23:20:12 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2016-03-04 23:20:12 +0900 |
| commit | c577657f6de64b743b12a21108dc9cc5cfc35098 (patch) | |
| tree | 1e3d9987d34eb400349a848bf3a1ce8c94601f11 /actionview/lib | |
| parent | 25c7c4adc9d7568997423338069323abe0827385 (diff) | |
| parent | 39c44480a23714252b023d024a315dc603f29437 (diff) | |
| download | rails-c577657f6de64b743b12a21108dc9cc5cfc35098.tar.gz rails-c577657f6de64b743b12a21108dc9cc5cfc35098.tar.bz2 rails-c577657f6de64b743b12a21108dc9cc5cfc35098.zip | |
Merge pull request #24052 from bquorning/partial-rendering-with-collection-and-dot-in-partial-name
Fix partial rendering with dot in filename
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/renderer/partial_renderer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/renderer/partial_renderer.rb b/actionview/lib/action_view/renderer/partial_renderer.rb index 514804b08e..f15d6c965e 100644 --- a/actionview/lib/action_view/renderer/partial_renderer.rb +++ b/actionview/lib/action_view/renderer/partial_renderer.rb @@ -521,7 +521,7 @@ module ActionView def retrieve_variable(path, as) variable = as || begin base = path[-1] == "/".freeze ? "".freeze : File.basename(path) - raise_invalid_identifier(path) unless base =~ /\A_?(.*)(?:\.\w+)*\z/ + raise_invalid_identifier(path) unless base =~ /\A_?(.*?)(\.\w+)*\z/ $1.to_sym end if @collection |