aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSam Stephenson <sam@37signals.com>2006-01-20 22:08:41 +0000
committerSam Stephenson <sam@37signals.com>2006-01-20 22:08:41 +0000
commitf9937dd04149e62fb834c815c60c5a96c025b240 (patch)
tree14e20df7445ee6578176b620ba73b25ace7c0d89 /actionpack
parent06dd1f2ca3398b978bb286688aa68acacd7dd712 (diff)
downloadrails-f9937dd04149e62fb834c815c60c5a96c025b240.tar.gz
rails-f9937dd04149e62fb834c815c60c5a96c025b240.tar.bz2
rails-f9937dd04149e62fb834c815c60c5a96c025b240.zip
Pass along blocks from render_to_string to render
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3442 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG2
-rwxr-xr-xactionpack/lib/action_controller/base.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index a5150cee7f..9d30f9b6a4 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Pass along blocks from render_to_string to render. [Sam Stephenson]
+
* Add render :update for inline RJS. [Sam Stephenson] Example:
class UserController < ApplicationController
def refresh
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 40fa24a696..8a34cd18cf 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -644,8 +644,8 @@ module ActionController #:nodoc:
# Renders according to the same rules as <tt>render</tt>, but returns the result in a string instead
# of sending it as the response body to the browser.
- def render_to_string(options = nil) #:doc:
- result = render(options)
+ def render_to_string(options = nil, &block) #:doc:
+ result = render(options, &block)
erase_render_results
@variables_added = nil
@template.instance_variable_set("@assigns_added", nil)