summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-23 01:13:29 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-23 01:13:29 +0200
commitf5f898f8f30968fb36413a14de2dc6a4599b79a6 (patch)
tree66b160ac9028be1b59ab6cfe7178705bfcbc9ca2 /system/core
parent348bd1e2623ae13ef0dc576464d98eb3673ef15a (diff)
Fix issue #779
Diffstat (limited to 'system/core')
-rw-r--r--system/core/URI.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/system/core/URI.php b/system/core/URI.php
index 6a8b1a5ac..15e6a5599 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -165,11 +165,8 @@ class CI_URI {
*/
protected function _set_uri_string($str)
{
- // Filter out control characters
- $str = remove_invisible_characters($str, FALSE);
-
- // If the URI contains only a slash we'll kill it
- $this->uri_string = ($str === '/') ? '' : $str;
+ // Filter out control characters and trim slashes
+ $this->uri_string = trim(remove_invisible_characters($str, FALSE), '/');
}
// --------------------------------------------------------------------