summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-01-18 17:58:33 +0100
committerAndrey Andreev <narf@devilix.net>2014-01-18 17:58:33 +0100
commit87f1dd555b8b53695deb2aa7dc8b83845f2cd02c (patch)
treeb79196cc0e0860f68aeef78d5c852a679676da80
parentecaef964232f7889eb3eab35b69cebbf3221ad66 (diff)
parenta4399051455f844f432ac453fb9c3202c4464cf2 (diff)
Merge branch 'develop' into feature/output_compressed_cache
-rw-r--r--system/core/URI.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/system/core/URI.php b/system/core/URI.php
index 6e0d7f993..13682cbee 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -156,6 +156,7 @@ class CI_URI {
}
}
+ $this->segments[0] = NULL;
// Populate the segments array
foreach (explode('/', preg_replace('|/*(.+?)/*$|', '\\1', $this->uri_string)) as $val)
{
@@ -167,6 +168,8 @@ class CI_URI {
$this->segments[] = $val;
}
}
+
+ unset($this->segments[0]);
}
}