aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-05-22 11:07:09 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-05-22 11:07:09 +0000
commit2f7c5f84e4834e49001ed565cfe45f14e120613f (patch)
tree03de7e58b569635cc117dad41b90d1db811a5139 /actionpack/lib/action_controller/base.rb
parentda0c4c5c9695e2ebe8d98b391d901b598dd293a2 (diff)
downloadrails-2f7c5f84e4834e49001ed565cfe45f14e120613f.tar.gz
rails-2f7c5f84e4834e49001ed565cfe45f14e120613f.tar.bz2
rails-2f7c5f84e4834e49001ed565cfe45f14e120613f.zip
Cure some ills discovered with the refactoring
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1351 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rwxr-xr-xactionpack/lib/action_controller/base.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index e128b1434e..696bc14292 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -440,6 +440,7 @@ module ActionController #:nodoc:
# A unified replacement for the individual renders (work-in-progress).
def render(options = {}, deprecated_status = nil)
+ # puts "Rendering: #{options.inspect}"
raise DoubleRenderError, "Can only render or redirect once per action" if performed?
# Backwards compatibility
@@ -489,7 +490,7 @@ module ActionController #:nodoc:
end
# Returns the result of the render as a string.
- def render_to_string(options) #:doc:
+ def render_to_string(options = {}) #:doc:
result = render(options)
erase_render_results
return result
@@ -538,7 +539,7 @@ module ActionController #:nodoc:
case options
when %r{^\w+://.*}
raise DoubleRenderError, "Can only render or redirect once per action" if performed?
- logger.info("Redirected to #{url}") unless logger.nil?
+ logger.info("Redirected to #{options}") unless logger.nil?
@response.redirect(options)
@performed_redirect = true