summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-08-17 08:52:42 +0200
committerAndrey Andreev <narf@devilix.net>2015-08-17 08:52:42 +0200
commit825fab7370a28b6c05da126842dd8df25e51e026 (patch)
tree5f0e39ab3d674a9d79464c31b005776433f4e8e7
parentd45180cb98cd987e2d5cce57a7965a87ee2aed7b (diff)
Allow capitals in the middle of model names
Requested in #4059
-rw-r--r--system/core/Loader.php2
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 5de7a9483..18e4c5287 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -290,7 +290,7 @@ class CI_Loader {
load_class('Model', 'core');
}
- $model = ucfirst(strtolower($model));
+ $model = ucfirst($model);
if ( ! class_exists($model))
{
foreach ($this->_ci_model_paths as $mod_path)
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index de9c95727..2d000ad6f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -10,6 +10,7 @@ Release Date: Not Released
- General Changes
- Updated the *application/config/constants.php* file to check if constants aren't already defined before doing that.
+ - Changed :doc:`Loader Library <libraries/loader>` method ``model()`` to only apply ``ucfirst()`` and not ``strtolower()`` to the requested class name.
Bug fixes for 3.0.2
-------------------