summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-11-04 18:22:38 +0100
committerAndrey Andreev <narf@devilix.net>2014-11-04 18:22:38 +0100
commita0471dcceb0a46ed50c2498bd8d630fb0e306064 (patch)
tree7679b234decbf09e836494e34527a21147c96c11 /system
parent5289f27c07bfb1d961317de351c4819f25dd5f2e (diff)
Fix #3310
Regression caused by 4b838af40d77684539dd40461bd92e6e453fe675 Quite possibly related to #3308
Diffstat (limited to 'system')
-rw-r--r--system/core/Common.php2
-rw-r--r--system/libraries/Driver.php3
2 files changed, 2 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
}