Permalink
Browse files

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

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1372 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent f8542a6 commit 6ce58318f5c1446c33599e3d0d19491618c684a6 @jamis jamis committed May 30, 2005
@@ -1,5 +1,7 @@
*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.
@@ -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
@@ -90,14 +90,20 @@ 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
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

0 comments on commit 6ce5831

Please sign in to comment.