holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

we need 4. parameter $try_unregistered parameter in Api\Hooks::single() as it is used by Setup, which is never an installed app

Browse Source
This commit is contained in:
Ralf Becker 2016-04-05 16:12:32 +00:00
parent 4591f5c8b4
commit 6ca8d13166
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Hooks.php
View File

@ -98,7 +98,7 @@ class Hooks
* @param boolean $try_unregistered =false If true, try to include old file-hook anyway (for setup)
* @return mixed False if no hook exists, True if old hook exists and whatever the new method-hook returns (can be True or False too!).
*/
public static function single($args, $appname = '', $no_permission_check = False)//,$try_unregistered = False)
public static function single($args, $appname = '', $no_permission_check = False, $try_unregistered = False)
{
//error_log(__METHOD__."(".array2string($args).",'$appname','$no_permission_check','$try_unregistered')");
@ -151,6 +151,13 @@ class Hooks
}
}
// hooks only existing in filesystem used by setup
if (!$ret && $try_unregistered && file_exists(EGW_SERVER_ROOT.($hook='/'.$appname.'/inc/hook_'.$location.'.inc.php')))
{
include(EGW_SERVER_ROOT.$hook);
return true;
}
if (!$ret) return false;
return count($ret) == 1 ? $ret[0] : $ret;