diff options
author | Michael Dennis <michaeljdennis@gmail.com> | 2011-08-29 19:06:59 +0200 |
---|---|---|
committer | Michael Dennis <michaeljdennis@gmail.com> | 2011-08-29 19:06:59 +0200 |
commit | 013f78dc6a878d7775aa2bbcef573934a6d88a72 (patch) | |
tree | 97ba05fd8e5efc066cb8f428744991fc628d207b /system/core/URI.php | |
parent | cb07a322bee5c5b0a551ab959c7475a1a702ad03 (diff) | |
parent | 70e61b5dc0b240c4a3341ca65ad9f2f5254df1b5 (diff) |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/core/URI.php')
-rwxr-xr-x | system/core/URI.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/URI.php b/system/core/URI.php index a3ae20cc3..8946bc76b 100755 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -175,7 +175,7 @@ class CI_URI { * @access private * @return string */ - private function _detect_uri() + protected function _detect_uri() { if ( ! isset($_SERVER['REQUEST_URI']) OR ! isset($_SERVER['SCRIPT_NAME'])) { @@ -232,7 +232,7 @@ class CI_URI { * @access private * @return string */ - private function _parse_cli_args() + protected function _parse_cli_args() { $args = array_slice($_SERVER['argv'], 1); |