gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 13:06:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

take over return value from hook in callHook() if it is !== null

Browse Source
This commit is contained in:
Uwe Steinmann 2016-11-22 09:21:12 +01:00
parent d70deddd2f
commit e85673cd5c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inc/inc.ClassControllerCommon.php
View File

@ -107,6 +107,11 @@ class SeedDMS_Controller_Common {
/** /**
* Call a controller hook * Call a controller hook
* *
* If a hook returns false, then no other hook will be called, because the
* method returns right away. If hook returns null, then this is treated like
* it was never called and the default action is executed. Any other value
* returned by the hook will be returned by this method.
*
* @param $hook string name of hook * @param $hook string name of hook
* @return mixed false if one of the hooks fails, * @return mixed false if one of the hooks fails,
* true if all hooks succedded, * true if all hooks succedded,
@ -115,6 +120,7 @@ class SeedDMS_Controller_Common {
function callHook($hook) { /* {{{ */ function callHook($hook) { /* {{{ */
$tmp = explode('_', get_class($this)); $tmp = explode('_', get_class($this));
if(isset($GLOBALS['SEEDDMS_HOOKS']['controller'][lcfirst($tmp[2])])) { if(isset($GLOBALS['SEEDDMS_HOOKS']['controller'][lcfirst($tmp[2])])) {
$r = null;
foreach($GLOBALS['SEEDDMS_HOOKS']['controller'][lcfirst($tmp[2])] as $hookObj) { foreach($GLOBALS['SEEDDMS_HOOKS']['controller'][lcfirst($tmp[2])] as $hookObj) {
if (method_exists($hookObj, $hook)) { if (method_exists($hookObj, $hook)) {
switch(func_num_args()) { switch(func_num_args()) {
@ -128,9 +134,12 @@ class SeedDMS_Controller_Common {
if($result === false) { if($result === false) {
return $result; return $result;
} }
if($result !== null) {
$r = $result;
}
} }
} }
return true; return $r;
} }
return null; return null;
} /* }}} */ } /* }}} */