diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-11-04 18:22:38 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-11-04 18:22:38 +0100 |
| commit | a0471dcceb0a46ed50c2498bd8d630fb0e306064 (patch) | |
| tree | 7679b234decbf09e836494e34527a21147c96c11 | |
| parent | 5289f27c07bfb1d961317de351c4819f25dd5f2e (diff) | |
Fix #3310
Regression caused by 4b838af40d77684539dd40461bd92e6e453fe675
Quite possibly related to #3308
| -rw-r--r-- | system/core/Common.php | 2 | ||||
| -rw-r--r-- | system/libraries/Driver.php | 3 | ||||
| -rw-r--r-- | user_guide_src/source/general/reserved_names.rst | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index 4277ef5b1..efb52e788 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -682,7 +682,7 @@ if ( ! function_exists('_shutdown_handler')) if (isset($last_error) && ($last_error['type'] & (E_ERROR | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING))) { - _exception_handler($last_error['type'], $last_error['message'], $last_error['file'], $last_error['line']); + _error_handler($last_error['type'], $last_error['message'], $last_error['file'], $last_error['line']); } } } diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php index 6a51c22ef..fb3d8cd03 100644 --- a/system/libraries/Driver.php +++ b/system/libraries/Driver.php @@ -299,8 +299,7 @@ class CI_Driver { return call_user_func_array(array($this->_parent, $method), $args); } - $trace = debug_backtrace(); - _exception_handler(E_ERROR, "No such method '{$method}'", $trace[1]['file'], $trace[1]['line']); + throw new BadMethodCallException('No such method: '.$method.'()'); exit(6); // EXIT_UNKNOWN_METHOD } diff --git a/user_guide_src/source/general/reserved_names.rst b/user_guide_src/source/general/reserved_names.rst index 81a05ace6..09c4549fd 100644 --- a/user_guide_src/source/general/reserved_names.rst +++ b/user_guide_src/source/general/reserved_names.rst @@ -41,6 +41,7 @@ Functions - :func:`is_https()` - :func:`function_usable()` - :func:`get_instance()` +- ``_error_handler()`` - ``_exception_handler()`` - ``_stringify_attributes()`` |