aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-03-04 20:44:01 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-03-04 20:44:01 +0000
commit8a1956bd99824e803fce9e0114c5bb63bcbdbc4a (patch)
tree1ec9ed7ade2a1065d1370e77a3f860837d583ec1 /actionpack/lib
parente0179c125423d070a1199911899fed93f0023900 (diff)
downloadrails-8a1956bd99824e803fce9e0114c5bb63bcbdbc4a.tar.gz
rails-8a1956bd99824e803fce9e0114c5bb63bcbdbc4a.tar.bz2
rails-8a1956bd99824e803fce9e0114c5bb63bcbdbc4a.zip
Sans request please
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6317 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rwxr-xr-xactionpack/lib/action_controller/request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index fa9b02919f..cc469e2e74 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -129,7 +129,7 @@ module ActionController
# Returns the complete URL used for this request
def url
- request.protocol + request.host_with_port + request.request_uri
+ protocol + host_with_port + request_uri
end
# Return 'https://' if this is an SSL request and 'http://' otherwise.