render(:inline) defaults to :layout => false

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1372 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

render(:inline) defaults to :layout => false
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1372 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6ce58318 · Jamis Buck · f8542a64 · 6ce58318 · 6ce58318 · 6ce58318
3 changed file
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
 *SVN*

+* render(:inline) always defaults to :layout => false.
+
 * Make sure the benchmarking render method always returns the output of the render.

 * render(:text), render(:partial), and render(:nothing) always default to :layout => false. This also fixes send_file, which was applying a layout if one existed for the current action.

--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -221,8 +221,8 @@ def render_with_a_layout(options = {}, deprecated_status = nil, deprecated_layou
      def render_with_a_layout_options(options)
        return options unless options.is_a?(Hash)
        case
-        when options[:text], options[:partial], options[:nothing]
-          # by default, :text, :partial, and :nothing never use a layout
+        when options[:text], options[:partial], options[:nothing], options[:inline]
+          # by default, :text, :partial, :inline, and :nothing never use a layout
          { :layout => false }.merge(options)
        else
          options

--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -90,6 +90,10 @@ def accessing_params_in_template
    render :inline =>  "Hello: <%= params[:name] %>"
  end

+  def accessing_params_in_template_with_layout
+    render :inline =>  "Hello: <%= params[:name] %>", :layout => nil
+  end
+
  def rescue_action(e) raise end
    
  private
@@ -97,7 +101,9 @@ def determine_layout
      case action_name 
        when "layout_test", "rendering_without_layout",
             "rendering_nothing_on_layout", "render_text_hello_world",
-             "partial_only", "partial_only_with_layout"
+             "partial_only", "partial_only_with_layout",
+             "accessing_params_in_template",
+             "accessing_params_in_template_with_layout"
          "layouts/standard"
        when "builder_layout_test"
          "layouts/builder"
@@ -237,4 +243,9 @@ def test_accessing_params_in_template
    get :accessing_params_in_template, :name => "David"
    assert_equal "Hello: David", @response.body
  end
+
+  def test_accessing_params_in_template_with_layout
+    get :accessing_params_in_template_with_layout, :name => "David"
+    assert_equal "<html>Hello: David</html>", @response.body
+  end
 end