From f8542a64b30bb6f67bcedf0c82de1291aab3c3d9 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Mon, 30 May 2005 09:00:46 +0000 Subject: Make sure the benchmarking render method always returns the result of the render, regardless of whether logging is enabled or not. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1371 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) (limited to 'actionpack/CHANGELOG') diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 9bac83a0e6..658d346056 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* 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. * verify with :redirect_to won't redirect if a redirect or render has already been performed #1350 -- cgit v1.2.3