summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2011-05-06 18:38:04 +0200
committerGreg Aker <greg.aker@ellislab.com>2011-05-06 18:38:04 +0200
commitbd4c87543818bd4573308743d44e12b78349ecd0 (patch)
tree8afedb90cf13a1a65f89de70dbb4f0c26d4ccf05 /system/core
parent02958b5b78835a484c1038d77f4bcfc5ae273a2d (diff)
parent827f3de2733e85ede6311feb2e4bf73ecf209eb3 (diff)
merging in changes
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Config.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index fa71f4d3d..55c623b3c 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -55,7 +55,7 @@ class CI_Config {
{
$base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
$base_url .= '://'. $_SERVER['HTTP_HOST'];
- $base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
+ $base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']).'/';
}
else