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.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 75b7c62378..46080b1318 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -90,7 +90,7 @@ module ActionController
end
def path
- path = path_info ? path_info : ( request_uri ? request_uri.split('?').first : '' )
+ (path_info && !path_info.empty?) ? path_info : (request_uri ? request_uri.split('?').first : '')
end
def port