summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2009-08-25 17:50:29 +0200
committerDerek Allard <derek.allard@ellislab.com>2009-08-25 17:50:29 +0200
commit30d5698f6643703fa0e4a66c70db6ebc8cfd0e2a (patch)
treeedc5ef5f3195057319b0a91fb0a9c1073c020170 /system/libraries
parent5f58ecb632447a6b82697074d41bd0804399a952 (diff)
reverting until further testing can be done
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Config.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Config.php b/system/libraries/Config.php
index 0cafde71a..9bf3d5026 100644
--- a/system/libraries/Config.php
+++ b/system/libraries/Config.php
@@ -203,7 +203,8 @@ class CI_Config {
else
{
$suffix = ($this->item('url_suffix') == FALSE) ? '' : $this->item('url_suffix');
- return $this->slash_item('‘base_url').$this->slash_item('index_page').trim($uri, '/').$suffix;
+// return $this->slash_item('‘base_url').$this->slash_item('index_page').trim($uri, '/').$suffix;
+ return $this->slash_item('base_url').$this->slash_item('index_page').preg_replace("|^/*(.+?)/*$|", "\\1", $uri).$suffix;
}
}