From 9928f943a7104bf65de359c437c3935cbd197311 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2017 11:20:33 +0100
Subject: [PATCH] Remove hook that is duplicate code with trigger.
---
htdocs/user/class/user.class.php | 18 +++++----------
htdocs/user/class/usergroup.class.php | 32 +++++++--------------------
2 files changed, 13 insertions(+), 37 deletions(-)
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 865b07c7cdc..49ff3803488 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1237,7 +1237,7 @@ class User extends CommonObject
*/
function update($user,$notrigger=0,$nosyncmember=0,$nosyncmemberpass=0)
{
- global $conf, $langs, $hookmanager;
+ global $conf, $langs;
$nbrowsaffected=0;
$error=0;
@@ -1412,22 +1412,14 @@ class User extends CommonObject
$action='update';
// Actions on extra fields (by external module or standard code)
- // FIXME le hook fait double emploi avec le trigger !!
- $hookmanager->initHooks(array('userdao'));
- $parameters=array('socid'=>$this->id);
- $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
- if (empty($reshook))
+ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ $result=$this->insertExtraFields();
+ if ($result < 0)
{
- $result=$this->insertExtraFields();
- if ($result < 0)
- {
- $error++;
- }
+ $error++;
}
}
- else if ($reshook < 0) $error++;
if (! $error && ! $notrigger)
{
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 4f96f46f251..093fc36e653 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -624,22 +624,14 @@ class UserGroup extends CommonObject
$action='create';
// Actions on extra fields (by external module or standard code)
- // TODO le hook fait double emploi avec le trigger !!
- $hookmanager->initHooks(array('groupdao'));
- $parameters=array();
- $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
- if (empty($reshook))
+ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ $result=$this->insertExtraFields();
+ if ($result < 0)
{
- $result=$this->insertExtraFields();
- if ($result < 0)
- {
- $error++;
- }
+ $error++;
}
}
- else if ($reshook < 0) $error++;
if (! $error && ! $notrigger)
{
@@ -695,22 +687,14 @@ class UserGroup extends CommonObject
$action='update';
// Actions on extra fields (by external module or standard code)
- // TODO le hook fait double emploi avec le trigger !!
- $hookmanager->initHooks(array('groupdao'));
- $parameters=array();
- $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
- if (empty($reshook))
+ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ $result=$this->insertExtraFields();
+ if ($result < 0)
{
- $result=$this->insertExtraFields();
- if ($result < 0)
- {
- $error++;
- }
+ $error++;
}
}
- else if ($reshook < 0) $error++;
if (! $error && ! $notrigger)
{
--
GitLab