summaryrefslogtreecommitdiffstats
path: root/system/core/URI.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-26 10:58:53 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-26 10:58:53 +0200
commita6aa8beaa98fac53c2cc15972bf3d1400d0c4f6a (patch)
tree292e04610b55d963ea19a14c805d75b6e90ea9a5 /system/core/URI.php
parent38e4a7765642f8945bf1c7668eb35e3a9de8cbb8 (diff)
parentb1099b3d3d6908a0b35a0d5a804b4b6e4fd57f66 (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);