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

Fix 1462, 1468 $this instead of $object

Browse Source
This commit is contained in:
Maxime Kohlhaas 2014-06-14 12:02:07 +02:00
parent 1250804e81
commit bada082b2b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@ -473,7 +473,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
$result = $interface->run_triggers('PROPAL_SENTBYMAIL', $object, $user, $langs, $conf); $result = $interface->run_triggers('PROPAL_SENTBYMAIL', $object, $user, $langs, $conf);
if ($result < 0) { if ($result < 0) {
$error ++; $error ++;
$this->errors = $interface->errors; $object->errors = $interface->errors;
} }
// Fin appel triggers // Fin appel triggers

8
htdocs/societe/soc.php
View File

@ -432,12 +432,12 @@ if (empty($reshook))
$sql = "UPDATE ".MAIN_DB_PREFIX."adherent"; $sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id; $sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG); dol_syslog(get_class($object)."::delete sql=".$sql, LOG_DEBUG);
if (! $this->db->query($sql)) if (! $object->db->query($sql))
{ {
$error++; $error++;
$this->error .= $this->db->lasterror(); $object->error .= $object->db->lasterror();
dol_syslog(get_class($this)."::delete erreur -1 ".$this->error, LOG_ERR); dol_syslog(get_class($object)."::delete erreur -1 ".$object->error, LOG_ERR);
} }
} }