diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-23 04:59:09 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-23 04:59:09 +0200 |
| commit | c2f59ef2d5d3ef28a113a11c24bee25eb03eeb56 (patch) | |
| tree | f704c46f5a71c7267cbf15e706a744a36e3da208 /system/core/URI.php | |
| parent | cf99aac39914d821e8864443d3aaa759f87258e9 (diff) | |
| parent | f5f898f8f30968fb36413a14de2dc6a4599b79a6 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'system/core/URI.php')
| -rw-r--r-- | system/core/URI.php | 7 |
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), '/'); } // -------------------------------------------------------------------- |