summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-31 20:52:11 +0100
committerAndrey Andreev <narf@bofh.bg>2012-10-31 20:52:11 +0100
commitea6688b3b9a7a208d1c44439c4f01801fd3b8c65 (patch)
treea6ba3d2d3a3da91cded928de0104655731a37cf2 /system/core
parent9dd2dbb8b9a3edecddcb3907b65a402fd1ae71b4 (diff)
Fix issue in resetting QUERY_STRING, GET vars introduced in f2b19fee7876708c7a7bb5cba6b7df682a9d2a53
Diffstat (limited to 'system/core')
-rw-r--r--system/core/URI.php28
1 files changed, 2 insertions, 26 deletions
diff --git a/system/core/URI.php b/system/core/URI.php
index 4a8d33e88..3b7718fff 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -212,7 +212,7 @@ class CI_URI {
$_SERVER['QUERY_STRING'] = $query;
}
- $this->_reset_query_string();
+ parse_str($_SERVER['QUERY_STRING'], $_GET);
if ($uri === '/' OR $uri === '')
{
@@ -248,7 +248,7 @@ class CI_URI {
$uri = rawurldecode($uri[0]);
}
- $this->_reset_query_string();
+ parse_str($_SERVER['QUERY_STRING'], $_GET);
return str_replace(array('//', '../'), '/', trim($uri, '/'));
}
@@ -256,30 +256,6 @@ class CI_URI {
// --------------------------------------------------------------------
/**
- * Reset QUERY_STRING
- *
- * Re-processes QUERY_STRING to and fetches the real GET values from it.
- * Useful for cases where we got the URI path from it's query string.
- *
- * @used-by CI_URI::_parse_request_uri()
- * @used-by CI_URI::_parse_query_string()
- * @return void
- */
- protected function _reset_query_string()
- {
- if ($_SERVER['QUERY_STRING'] === '')
- {
- $_GET = array();
- }
- else
- {
- parse_str($_SERVER['QUERY_STRING']);
- }
- }
-
- // --------------------------------------------------------------------
-
- /**
* Is CLI Request?
*
* Duplicate of method from the Input class to test to see if