diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-04-23 08:24:21 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-04-23 08:24:21 -0700 |
| commit | 0f5af608d99c6086ed95798bf93b44f4254f7c18 (patch) | |
| tree | 7087f657f21e315c0320bbae21d4c1e1b29c9c29 /actionpack/lib/action_view/renderer/partial_renderer.rb | |
| parent | dd01c11f9874bebfb9caf90c9da0e3626bb5b78b (diff) | |
| parent | 6b8dd70083d747535cc35dce176e5afb6ad98177 (diff) | |
| download | rails-0f5af608d99c6086ed95798bf93b44f4254f7c18.tar.gz rails-0f5af608d99c6086ed95798bf93b44f4254f7c18.tar.bz2 rails-0f5af608d99c6086ed95798bf93b44f4254f7c18.zip | |
Merge pull request #5866 from tiegz/minor_fixes_3-2-stable
Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
Diffstat (limited to 'actionpack/lib/action_view/renderer/partial_renderer.rb')
| -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 25c41f042b..3093aca91e 100644 --- a/actionpack/lib/action_view/renderer/partial_renderer.rb +++ b/actionpack/lib/action_view/renderer/partial_renderer.rb @@ -407,7 +407,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 |