aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/base.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
-rw-r--r--actionpack/lib/action_view/base.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 9a4e00057a..b6df4ba917 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -194,8 +194,10 @@ module ActionView #:nodoc:
render_file(options[:file], options[:use_full_path], options[:locals])
elsif options[:partial] && options[:collection]
render_partial_collection(options[:partial], options[:collection], options[:spacer_template], options[:locals])
- elsif options.is_a?(Hash) && options[:partial]
+ elsif options[:partial]
render_partial(options[:partial], options[:object], options[:locals])
+ elsif options[:inline]
+ render_template(options[:type] || :rhtml, options[:inline], options[:locals] || {})
end
end
end