diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-04-28 13:28:07 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-04-28 13:28:07 +0200 |
| commit | 4ac24c201c673b52b39b7efc2235f1d84d1acd08 (patch) | |
| tree | 5e8ae1dc8c95bf6bb8bb5534a3d5b001bec647ee /system/core | |
| parent | 9343851e6155f6728e02332000f1885e248e907d (diff) | |
Fix #4605
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/Config.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index ca6fb3793..9fd3e4a7d 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -319,7 +319,7 @@ class CI_Config { } } - return $base_url.ltrim($this->_uri_string($uri), '/'); + return $base_url.$this->_uri_string($uri); } // ------------------------------------------------------------- @@ -337,11 +337,8 @@ class CI_Config { { if ($this->item('enable_query_strings') === FALSE) { - if (is_array($uri)) - { - $uri = implode('/', $uri); - } - return trim($uri, '/'); + is_array($uri) && $uri = implode('/', $uri); + return ltrim($uri, '/'); } elseif (is_array($uri)) { |