Commit d994629b authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "PHP7 changes the type required for exception handler" into 15.10_STABLE

parents 495d5c08 49956eb3
......@@ -496,10 +496,11 @@ function error ($code, $message, $file, $line, $vars) {
* situations. After this is called the script will end, so make sure to catch
* any exceptions that you can deal with.
*
* @param Exception $e The exception that was thrown.
* @param Throwable $e The exception that was thrown. (For PHP 5 & 7 cross-compatibility,
* this parameter must have no type declaration.)
* @access private
*/
function exception (Exception $e) {
function exception ($e) {
global $USER;
if ($USER) {
if (!($e instanceof MaharaException) || get_class($e) == 'MaharaException') {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment