Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix issue in resetting QUERY_STRING, GET vars introduced in f2b19fe

  • Loading branch information...
commit ea6688b3b9a7a208d1c44439c4f01801fd3b8c65 1 parent 9dd2dbb
@narfbg narfbg authored
Showing with 2 additions and 26 deletions.
  1. +2 −26 system/core/URI.php
View
28 system/core/URI.php
@@ -212,7 +212,7 @@ protected function _parse_request_uri()
$_SERVER['QUERY_STRING'] = $query;
}
- $this->_reset_query_string();
+ parse_str($_SERVER['QUERY_STRING'], $_GET);
if ($uri === '/' OR $uri === '')
{
@@ -248,7 +248,7 @@ protected function _parse_query_string()
$uri = rawurldecode($uri[0]);
}
- $this->_reset_query_string();
+ parse_str($_SERVER['QUERY_STRING'], $_GET);
return str_replace(array('//', '../'), '/', trim($uri, '/'));
}
@@ -256,30 +256,6 @@ protected function _parse_query_string()
// --------------------------------------------------------------------
/**
- * 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

0 comments on commit ea6688b

Please sign in to comment.
Something went wrong with that request. Please try again.