1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge pull request #4731 from ndbroadbent/revert_build_original_fullpath

Reverted build_original_fullpath method refactor
This commit is contained in:
Santiago Pastorino 2012-01-27 17:15:46 -08:00
commit fd3211ef67

View file

@ -290,7 +290,15 @@ module Rails
end
def build_original_fullpath(env)
["#{env["SCRIPT_NAME"]}#{env["PATH_INFO"]}", env["QUERY_STRING"]].reject(&:blank?).join("?")
path_info = env["PATH_INFO"]
query_string = env["QUERY_STRING"]
script_name = env["SCRIPT_NAME"]
if query_string.present?
"#{script_name}#{path_info}?#{query_string}"
else
"#{script_name}#{path_info}"
end
end
end
end