diff options
author | Sam Stephenson <sam@37signals.com> | 2006-01-23 07:27:24 +0000 |
---|---|---|
committer | Sam Stephenson <sam@37signals.com> | 2006-01-23 07:27:24 +0000 |
commit | 5f44411d948f0cefb6a968a357d305c4c97c2174 (patch) | |
tree | 166ed212aeafff5269f1e77badb88c6b958e36ff /actionpack/lib/action_controller | |
parent | 84361478256f620cc3c4d31235eeec28bba058f0 (diff) | |
download | rails-5f44411d948f0cefb6a968a357d305c4c97c2174.tar.gz rails-5f44411d948f0cefb6a968a357d305c4c97c2174.tar.bz2 rails-5f44411d948f0cefb6a968a357d305c4c97c2174.zip |
Backing out of [3470] until visual_effect, et al can work
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3471 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 7f8ff5ed09..0a9368f684 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -687,7 +687,7 @@ module ActionController #:nodoc: end def render_javascript(javascript, status = nil) - @response.headers['Content-Type'] = 'text/javascript' + @response.headers['Content-type'] = 'text/javascript' render_text(javascript, status) end @@ -719,8 +719,7 @@ module ActionController #:nodoc: @response.body = nil @performed_render = false end - - + # Clears the redirected results from the headers, resets the status to 200 and returns # the URL that was used to redirect or nil if there was no redirected URL # Note that +redirect_to+ will change the body of the response to indicate a redirection. |