From f35ae5eb7fc81b1c6a903591c6ff56103e6e247f Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 10 Oct 2014 15:40:56 +0300 Subject: Fix #3270 Related: #3268, 4bdb66759c24c41fefec7952b12a0595a671eaa2 --- system/core/Config.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'system') diff --git a/system/core/Config.php b/system/core/Config.php index 18380a0db..ee738d752 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -78,11 +78,8 @@ class CI_Config { { if (isset($_SERVER['HTTP_HOST'])) { - $base_url = (is_https() ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].'/'; - if ( ! empty($_SERVER['DOCUMENT_ROOT'])) - { - $base_url .= ltrim(str_replace('\\', '/', substr(FCPATH, strlen($_SERVER['DOCUMENT_ROOT']))), '/\\'); - } + $base_url = (is_https() ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'] + .substr($_SERVER['SCRIPT_NAME'], 0, strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME']))); } else { -- cgit v1.2.3-24-g4f1b