diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-25 14:43:15 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-25 14:43:15 -0700 |
| commit | ca3b42981547aab9da4ee2e11b9fa3d9bb805169 (patch) | |
| tree | 74f9a3a0f2543744054f219e9f27a1547023732d /actionpack/lib | |
| parent | 59a53f45258d10e689fc9dc0f0cf18746dd13579 (diff) | |
| parent | 3d3fd39caa8f938a44fffc1c39bde8f0170e8f18 (diff) | |
| download | rails-ca3b42981547aab9da4ee2e11b9fa3d9bb805169.tar.gz rails-ca3b42981547aab9da4ee2e11b9fa3d9bb805169.tar.bz2 rails-ca3b42981547aab9da4ee2e11b9fa3d9bb805169.zip | |
Merge pull request #8030 from calebthompson/fix-ternary
Fix gratuitous use of ternary operator
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/renderer/template_renderer.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb index 156ad4e547..2a5ea5a711 100644 --- a/actionpack/lib/action_view/renderer/template_renderer.rb +++ b/actionpack/lib/action_view/renderer/template_renderer.rb @@ -29,8 +29,11 @@ module ActionView handler = Template.handler_for_extension(options[:type] || "erb") Template.new(options[:inline], "inline template", handler, :locals => keys) elsif options.key?(:template) - options[:template].respond_to?(:render) ? - options[:template] : find_template(options[:template], options[:prefixes], false, keys, @details) + if options[:template].respond_to?(:render) + options[:template] + else + find_template(options[:template], options[:prefixes], false, keys, @details) + end else raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file or :text option." end |