extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 17:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove Exception from function signature of egw_exception_handler and _egw_log_exception, as php 7 throws Error not inherited from Exception, but Throwable does not exist in php < 7.0

Browse Source
This commit is contained in:
Ralf Becker 2016-02-14 17:54:14 +00:00
parent 8246768f59
commit b5aeadf265
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpgwapi/inc/common_functions.inc.php
View File

@ -1777,10 +1777,10 @@ function json_php_unserialize($str, $allow_not_serialized=false)
/**
* Clasify exception for a headline and log it to error_log, if not running as cli
*
* @param Exception $e
* @param Exception|Error $e
* @param string &$headline
*/
function _egw_log_exception(Exception $e,&$headline=null)
function _egw_log_exception($e,&$headline=null)
{
$trace = explode("\n", $e->getTraceAsString());
if ($e instanceof egw_exception_no_permission)
@ -1824,9 +1824,9 @@ function _egw_log_exception(Exception $e,&$headline=null)
*
* Does NOT return
*
* @param Exception $e
* @param Exception|Error $e
*/
function egw_exception_handler(Exception $e)
function egw_exception_handler($e)
{
// handle redirects without logging
if (is_a($e, 'egw_exception_redirect'))