aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/request.rb')
-rwxr-xr-xactionpack/lib/action_controller/request.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index ca8dfff161..c3d440d815 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -158,12 +158,10 @@ module ActionController
path = (uri = request_uri) ? uri.split('?').first : ''
# Cut off the path to the installation directory if given
- if root = relative_url_root
- path[root.length..-1]
- else
- path
- end
- end
+ root = relative_url_root
+ path[0, root.length] = '' if root
+ path || ''
+ end
# Returns the path minus the web server relative installation directory.
# This method returns nil unless the web server is apache.