aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/renderer/partial_renderer.rb
diff options
context:
space:
mode:
authorTieg Zaharia <tieg@kickstarter.com>2012-04-16 13:53:51 -0400
committerTieg Zaharia <tieg@kickstarter.com>2012-04-16 13:53:51 -0400
commitdcc11b22828ac2a52f136d00a732a38bd9371a16 (patch)
tree75d782c9e44142d9c86645ccaaa8e09d0fbbd692 /actionpack/lib/action_view/renderer/partial_renderer.rb
parent9a97699460e9b35a4c9e7a9694cf444fa75c7861 (diff)
downloadrails-dcc11b22828ac2a52f136d00a732a38bd9371a16.tar.gz
rails-dcc11b22828ac2a52f136d00a732a38bd9371a16.tar.bz2
rails-dcc11b22828ac2a52f136d00a732a38bd9371a16.zip
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.rb2
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..f96b1c6ef3 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[:as].try(:to_sym) || path[%r'_?(\w+)(\.\w+)*$', 1].try(:to_sym)
variable_counter = :"#{variable}_counter" if @collection
[variable, variable_counter]
end