summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/core/Config.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index db406dfde..18380a0db 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -78,9 +78,11 @@ class CI_Config {
{
if (isset($_SERVER['HTTP_HOST']))
{
- $base_url = (is_https() ? 'https' : 'http')
- .'://'.$_SERVER['HTTP_HOST']
- .substr($_SERVER['SCRIPT_NAME'], 0, -strlen(basename($_SERVER['SCRIPT_NAME'])));
+ $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']))), '/\\');
+ }
}
else
{