summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-02 16:17:29 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-02 16:17:29 +0200
commit9e0be2ba2179a93200d16a72c74e2ac61f9a71d4 (patch)
tree69a0b447980c260ee40d53714ad58036ada8da1a /system/core
parentb75faa1a03a32330e412f0bd0332fb9fa389e914 (diff)
parentee04a913dfd78d394a0e09f01655df0870369512 (diff)
Merge upstream
Diffstat (limited to 'system/core')
-rwxr-xr-xsystem/core/CodeIgniter.php2
-rwxr-xr-xsystem/core/Input.php1
-rwxr-xr-xsystem/core/Router.php5
-rwxr-xr-xsystem/core/URI.php4
4 files changed, 4 insertions, 8 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 793c4687e..349f9f2d0 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -153,7 +153,7 @@
*
* Note: Order here is rather important as the UTF-8
* class needs to be used very early on, but it cannot
- * properly determine if UTf-8 can be supported until
+ * properly determine if UTF-8 can be supported until
* after the Config class is instantiated.
*
*/
diff --git a/system/core/Input.php b/system/core/Input.php
index 7594a2e45..fc2a550bc 100755
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -226,7 +226,6 @@ class CI_Input {
*/
public function cookie($index = '', $xss_clean = FALSE)
{
- $index = config_item('cookie_prefix').$index;
return $this->_fetch_from_array($_COOKIE, $index, $xss_clean);
}
diff --git a/system/core/Router.php b/system/core/Router.php
index fe9909b06..9314052fe 100755
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -242,12 +242,9 @@ class CI_Router {
$segments[1] = 'index';
}
- // This is being routed to a file in a sub directory
- $this->directory and array_unshift($segments, trim($this->directory, '/'));
-
// Update our "routed" segment array to contain the segments.
// Note: If there is no custom routing, this array will be
- // identical to $this->uri->segments
+ // identical to $this->uri->segments
$this->uri->rsegments = $segments;
}
diff --git a/system/core/URI.php b/system/core/URI.php
index 705575a0c..cf82c5838 100755
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -645,10 +645,10 @@ class CI_URI {
*/
public function ruri_string()
{
- return implode('/', $this->rsegment_array());
+ return '/'.implode('/', $this->rsegment_array());
}
}
/* End of file URI.php */
-/* Location: ./system/core/URI.php */ \ No newline at end of file
+/* Location: ./system/core/URI.php */