summaryrefslogtreecommitdiffstats
path: root/system/core/CodeIgniter.php
diff options
context:
space:
mode:
authorDaniel Paul Searles <daniel.paul.searles@gmail.com>2012-11-05 23:34:50 +0100
committerDaniel Paul Searles <daniel.paul.searles@gmail.com>2012-11-05 23:34:50 +0100
commit0e4069ba30922941917a26463cba250b0f14c8ef (patch)
tree76a7de06b6f8b07ab36ebaffe78235f22dffb1a2 /system/core/CodeIgniter.php
parent3aca5695b2b8561986d11e20e6da46f9b32060f1 (diff)
parentd743cdbe448258cc7f02abf15e8dc797dc6403eb (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/CodeIgniter.php')
-rw-r--r--system/core/CodeIgniter.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 1cd6403bf..89081b572 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -295,7 +295,11 @@ defined('BASEPATH') OR exit('No direct script access allowed');
}
else
{
- if ( ! is_callable(array($class, $method)))
+ // WARNING: It appears that there are issues with is_callable() even in PHP 5.2!
+ // Furthermore, there are bug reports and feature/change requests related to it
+ // that make it unreliable to use in this context. Please, DO NOT change this
+ // work-around until a better alternative is available.
+ if ( ! in_array(strtolower($method), array_map('strtolower', get_class_methods($class)), TRUE))
{
if (empty($RTR->routes['404_override']))
{