Merge pull request #304 from MVUG/mvug_fixes_odbc
odbc calls incorrect parent in construct
diff --git a/system/core/URI.php b/system/core/URI.php
index a3ae20c..8946bc7 100755
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -175,7 +175,7 @@
* @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 @@
* @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 62f6b4f..e82fcb2 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -95,6 +95,11 @@
<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>