aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/components.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-20 17:18:59 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-20 17:18:59 +0000
commite4f07888ceca3c2ac11818a45cc3374537737e8e (patch)
treeb7431ec26eb3087cc17439026586e0664549a3d7 /actionpack/lib/action_controller/components.rb
parent69d0f50206bcca5d6b7d9c491637509af434651c (diff)
downloadrails-e4f07888ceca3c2ac11818a45cc3374537737e8e.tar.gz
rails-e4f07888ceca3c2ac11818a45cc3374537737e8e.tar.bz2
rails-e4f07888ceca3c2ac11818a45cc3374537737e8e.zip
Made caching work for WEBrick and lighttpd by appending .html for all URLs not already containing a dot
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@715 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/components.rb')
-rw-r--r--actionpack/lib/action_controller/components.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb
index 877d8888bd..6371a4255d 100644
--- a/actionpack/lib/action_controller/components.rb
+++ b/actionpack/lib/action_controller/components.rb
@@ -5,8 +5,9 @@ module ActionController #:nodoc:
base.helper do
def render_component(options)
@controller.logger.info("Start rendering component (#{options.inspect}): ")
- @controller.send(:component_response, options).body
+ result = @controller.send(:component_response, options).body
@controller.logger.info("\n\nEnd of component rendering")
+ return result
end
end
end
@@ -15,8 +16,9 @@ module ActionController #:nodoc:
def render_component(options = {}) #:doc:
response = component_response(options)
logger.info "Rendering component (#{options.inspect}): "
- render_text(response.body, response.headers["Status"])
+ result = render_text(response.body, response.headers["Status"])
logger.info("\n\nEnd of component rendering")
+ return result
end
private