From 1cb138fddcb8e79965497e31b3d1a8c537ed3147 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 1 Apr 2016 14:54:29 +0900 Subject: [PATCH] Fix double slash in base URL --- common/constants.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/constants.php b/common/constants.php index 48350a753..214c5bfa3 100644 --- a/common/constants.php +++ b/common/constants.php @@ -25,11 +25,11 @@ define('RX_BASEDIR', str_replace('\\', '/', dirname(__DIR__)) . '/'); */ if (isset($_SERVER['DOCUMENT_ROOT']) && !strncmp(RX_BASEDIR, str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), strlen($_SERVER['DOCUMENT_ROOT']))) { - define('RX_BASEURL', '/' . trim(substr(RX_BASEDIR, strlen($_SERVER['DOCUMENT_ROOT'])), '/') . '/'); + define('RX_BASEURL', str_replace('//', '/', '/' . trim(substr(RX_BASEDIR, strlen($_SERVER['DOCUMENT_ROOT'])), '/') . '/')); } elseif (isset($_SERVER['PHP_SELF']) && ($len = strlen($_SERVER['PHP_SELF'])) && $len >= 10 && substr($_SERVER['PHP_SELF'], $len - 10) === '/index.php') { - define('RX_BASEURL', '/' . trim(str_replace('\\', '/', substr($_SERVER['PHP_SELF'], 0, $len - 10)), '/') . '/'); + define('RX_BASEURL', str_replace('//', '/', '/' . trim(str_replace('\\', '/', substr($_SERVER['PHP_SELF'], 0, $len - 10)), '/') . '/')); } else {