diff options
| author | Andrey Andreev <narf@devilix.net> | 2021-02-04 16:33:45 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2021-02-04 16:33:45 +0100 |
| commit | fda124cfd788a9a70cd8608648513271fb859cd9 (patch) | |
| tree | 9238013889c335d0df76d8bf96ebddebb5d26ae0 /system/libraries | |
| parent | 3a6259b85f397c05f312f4124f90cfa534df576a (diff) | |
| parent | 0925b5099919300a239909588351a6482c5e792d (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Migration.php | 2 | ||||
| -rw-r--r-- | system/libraries/Xmlrpcs.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php index 1b7808923..915d4e453 100644 --- a/system/libraries/Migration.php +++ b/system/libraries/Migration.php @@ -288,7 +288,7 @@ class CI_Migration { $this->_error_string = sprintf($this->lang->line('migration_class_doesnt_exist'), $class); return FALSE; } - elseif ( ! is_callable(array($class, $method))) + elseif ( ! method_exists($class, $method) OR ! (new ReflectionMethod($class, $method))->isPublic()) { $this->_error_string = sprintf($this->lang->line('migration_missing_'.$method.'_method'), $class); return FALSE; diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php index ad767eabe..e20bf4836 100644 --- a/system/libraries/Xmlrpcs.php +++ b/system/libraries/Xmlrpcs.php @@ -348,7 +348,7 @@ class CI_Xmlrpcs extends CI_Xmlrpc { return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']); } } - elseif (($objectCall && ! is_callable(array($method_parts[0], $method_parts[1]))) + elseif (($objectCall && ( ! method_exists($method_parts[0], $method_parts[1]) OR ! (new ReflectionMethod($method_parts[0], $method_parts[1]))->isPublic())) OR ( ! $objectCall && ! is_callable($this->methods[$methName]['function'])) ) { |