summaryrefslogtreecommitdiffstats
path: root/system/core/URI.php
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-08-26 23:31:44 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-08-26 23:31:44 +0200
commit84c3bf369497e33b600deaea20297e89e265047a (patch)
tree64f49bddb2b065f048664aed46ee7766d876fa9f /system/core/URI.php
parentbe72bd2d1cdba222bbbce547e1603de1e4ec7961 (diff)
parentb183ece10dcde599c04af412f0f5c1c776ed29d8 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/URI.php')
-rwxr-xr-xsystem/core/URI.php4
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);