diff options
| author | Greg Aker <greg@gregaker.net> | 2011-08-26 04:29:15 +0200 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-08-26 04:29:15 +0200 |
| commit | e0b77de3c32599e2a42c1ade989cbe69eee0e375 (patch) | |
| tree | ad21c76692f77b6b4282bc945ff0f93c08111639 | |
| parent | 6935931e0165aed0ef2d5bc9c0f51bf845969c35 (diff) | |
| parent | 1c342ebc83b2d303ba68415ce2ec6b5b173a1b66 (diff) | |
Merge pull request #305 from p4ul/patch-2
changed private functions to protected so MY_URI can override them.
| -rwxr-xr-x | system/core/URI.php | 4 | ||||
| -rw-r--r-- | user_guide/changelog.html | 5 |
2 files changed, 7 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); diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 865bdd8ac..bb80ab8b8 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -95,6 +95,11 @@ Change Log <li><samp>CI_Loader::_ci_autoloader()</samp> is now a protected method.</li> </ul> </li> + <li>Core + <ul> + <li class="reactor">Changed private functions in CI_URI to protected so MY_URI can override them.</li> + </ul> + </li> </ul> <h3>Bug fixes for 2.1.0</h3> |