diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-06-19 11:02:53 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-06-19 11:02:53 +0200 |
| commit | 8186b6b398c26c0c1e0052eaddf4fc122e4929a5 (patch) | |
| tree | 0290ebd53dd9b5167680e80e22342d751001fe56 /system/core/CodeIgniter.php | |
| parent | af5c8960d80a9db362722ca675ffddb2079bbce9 (diff) | |
| parent | 47f540e82cbc1591cc7f1aa92d47a8c8c4028c63 (diff) | |
Merge branch '3.1-stable' into develop
Conflicts resolved:
system/core/CodeIgniter.php
tests/codeigniter/libraries/Form_validation_test.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
Diffstat (limited to 'system/core/CodeIgniter.php')
| -rw-r--r-- | system/core/CodeIgniter.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 8eed52eb7..c97ff2bbb 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -383,7 +383,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * ReflectionMethod::isConstructor() is the ONLY reliable check, * knowing which method will be executed as a constructor. */ - elseif ( ! is_callable(array($class, $method)) && strcasecmp($class, $method) === 0) + elseif ( ! is_callable(array($class, $method))) { $reflection = new ReflectionMethod($class, $method); if ( ! $reflection->isPublic() OR $reflection->isConstructor()) |