1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index a9076760c5..36beb5c8d0 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -21,7 +21,8 @@ module ActionView
 
     def render_once(options)
       paths, locals = options[:once], options[:locals] || {}
-      layout, keys, prefix = options[:layout], locals.keys, options[:prefix]
+      layout, keys  = options[:layout], locals.keys
+      prefix = options.fetch(:prefix, @view.controller_prefix)
 
       raise "render :once expects a String or an Array to be given" unless paths
 
@@ -45,7 +46,7 @@ module ActionView
         with_fallbacks { find_template(options[:file], options[:prefix], false, keys) }
       elsif options.key?(:inline)
         handler = Template.handler_class_for_extension(options[:type] || "erb")
-        Template::Inline.new(options[:inline], handler, :locals => keys)
+        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[:prefix], false, keys)