diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-04-20 16:23:27 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-04-20 16:23:27 -0700 |
| commit | ed8108300b2bb96f9f6888188f4fb8cd418ab950 (patch) | |
| tree | 23a7ee40b4f3c2aa775278cbda4227df47ec3f82 /actionpack/lib/action_view | |
| parent | 42f6e9fb38101c0fe199d5425bd71965f9a6dfc9 (diff) | |
| parent | 5d8d639f0086aff5cb63587b629968f8439d65d7 (diff) | |
| download | rails-ed8108300b2bb96f9f6888188f4fb8cd418ab950.tar.gz rails-ed8108300b2bb96f9f6888188f4fb8cd418ab950.tar.bz2 rails-ed8108300b2bb96f9f6888188f4fb8cd418ab950.zip | |
Merge pull request #5865 from tiegz/minor_fixes
Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/renderer/partial_renderer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb index 8b53867aea..34ea06c9cf 100644 --- a/actionpack/lib/action_view/renderer/partial_renderer.rb +++ b/actionpack/lib/action_view/renderer/partial_renderer.rb @@ -451,7 +451,7 @@ module ActionView end def retrieve_variable(path) - variable = @options[:as].try(:to_sym) || path[%r'_?(\w+)(\.\w+)*$', 1].to_sym + variable = @options.fetch(:as) { path[%r'_?(\w+)(\.\w+)*$', 1] }.try(:to_sym) variable_counter = :"#{variable}_counter" if @collection [variable, variable_counter] end |