lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: missing function return value if errors

Browse Source
This commit is contained in:
Regis Houssin 2011-08-18 07:05:13 +00:00
parent 1817e92bbf
commit c0f0f52ff4
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/core/class/hookmanager.class.php
View File

@ -21,7 +21,7 @@
* \file htdocs/core/class/hookmanager.class.php * \file htdocs/core/class/hookmanager.class.php
* \ingroup core * \ingroup core
* \brief File of class to manage hooks * \brief File of class to manage hooks
* \version $Id: hookmanager.class.php,v 1.7 2011/08/11 09:26:34 hregis Exp $ * \version $Id: hookmanager.class.php,v 1.8 2011/08/18 07:05:13 hregis Exp $
*/ */
@ -143,41 +143,29 @@ class HookManager
// Hooks that return int // Hooks that return int
if ($method == 'doActions' && method_exists($actioninstance,$method)) if ($method == 'doActions' && method_exists($actioninstance,$method))
{ {
$restmp+=$actioninstance->doActions($parameters, $object, $action); // action can be changed by method (to go back to other action for example), socid can be changed/set by method (during creation for example) $resaction+=$actioninstance->doActions($parameters, $object, $action); // action can be changed by method (to go back to other action for example), socid can be changed/set by method (during creation for example)
if ($restmp < 0 || ! empty($actioninstance->error) || (! empty($actioninstance->errors) && sizeof($actioninstance->errors) > 0)) if ($resaction < 0 || ! empty($actioninstance->error) || (! empty($actioninstance->errors) && sizeof($actioninstance->errors) > 0))
{ {
$this->error=$actioninstance->error; $this->errors=$actioninstance->errors; $this->error=$actioninstance->error; $this->errors=$actioninstance->errors;
if ($action=='add') $action='create'; // TODO this change must be inside the doActions if ($action=='add') $action='create'; // TODO this change must be inside the doActions
if ($action=='update') $action='edit'; // TODO this change must be inside the doActions if ($action=='update') $action='edit'; // TODO this change must be inside the doActions
} }
else
{
$resaction+=$restmp;
}
} }
else if ($method == 'showInputFields' && method_exists($actioninstance,$method)) else if ($method == 'showInputFields' && method_exists($actioninstance,$method))
{ {
$restmp+=$actioninstance->showInputFields($parameters, $object, $action); // action can be changed by method (to go back to other action for example), socid can be changed/set by method (during creation for example) $resaction+=$actioninstance->showInputFields($parameters, $object, $action); // action can be changed by method (to go back to other action for example), socid can be changed/set by method (during creation for example)
if ($restmp < 0 || ! empty($actioninstance->error) || (! empty($actioninstance->errors) && sizeof($actioninstance->errors) > 0)) if ($resaction < 0 || ! empty($actioninstance->error) || (! empty($actioninstance->errors) && sizeof($actioninstance->errors) > 0))
{ {
$this->error=$actioninstance->error; $this->errors=$actioninstance->errors; $this->error=$actioninstance->error; $this->errors=$actioninstance->errors;
} }
else
{
$resaction+=$restmp;
}
} }
else if ($method == 'showOutputFields' && method_exists($actioninstance,$method)) else if ($method == 'showOutputFields' && method_exists($actioninstance,$method))
{ {
$restmp+=$actioninstance->showOutputFields($parameters, $object, $action); // action can be changed by method (to go back to other action for example), socid can be changed/set by method (during creation for example) $resaction+=$actioninstance->showOutputFields($parameters, $object, $action); // action can be changed by method (to go back to other action for example), socid can be changed/set by method (during creation for example)
if ($restmp < 0 || ! empty($actioninstance->error) || (! empty($actioninstance->errors) && sizeof($actioninstance->errors) > 0)) if ($resaction < 0 || ! empty($actioninstance->error) || (! empty($actioninstance->errors) && sizeof($actioninstance->errors) > 0))
{ {
$this->error=$actioninstance->error; $this->errors=$actioninstance->errors; $this->error=$actioninstance->error; $this->errors=$actioninstance->errors;
} }
else
{
$resaction+=$restmp;
}
} }
// Generic hooks that return a string (printSearchForm, printLeftBlock, formBuilddocOptions, ...) // Generic hooks that return a string (printSearchForm, printLeftBlock, formBuilddocOptions, ...)
else if (method_exists($actioninstance,$method)) else if (method_exists($actioninstance,$method))