From 1cb4c6cc0119912a1e8bb389d6d7a3842d218a76 Mon Sep 17 00:00:00 2001 From: Pieter Jonckiere Date: Sun, 20 Apr 2014 18:03:28 +0200 Subject: [PATCH] Issue #1433996 by David_Rothstein: fix the calculation of the current script urls for subsites. --- core/includes/install.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/includes/install.inc b/core/includes/install.inc index 3789ff3..70e0675 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -906,7 +906,7 @@ function install_goto($path) { * @see drupal_requirements_url() */ function drupal_current_script_url($query = array()) { - $uri = $_SERVER['SCRIPT_NAME']; + $uri = parse_url(request_uri(), PHP_URL_PATH); $query = array_merge(drupal_get_query_parameters(), $query); if (!empty($query)) { $uri .= '?' . UrlHelper::buildQuery($query); -- 1.7.10.4