1 files changed, 8 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 2e0d554a55..91ebc7e69d 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -471,7 +471,14 @@ module ActionController #:nodoc:
           render(options.merge({ :file => options[:template], :use_full_path => true }))
 
         elsif options[:inline]
-          render(options.merge({ :text => @template.render_template(options[:type] || :rhtml, options[:inline]) }))
+          render(options.merge({
+            :text =>
+              @template.render_template(
+                options[:type] || :rhtml,
+                options[:inline],
+                options[:locals] || {}
+              )
+          }))
 
         elsif options[:action]
           render(options.merge({ :template => default_template_name(options[:action]) }))