Skip to content
Snippets Groups Projects
Commit 45dfb8ca authored by Juanjo Menent's avatar Juanjo Menent
Browse files

Fix #5843 best way fixing

parent 298e5cee
No related branches found
No related tags found
No related merge requests found
......@@ -558,7 +558,6 @@ class Categorie extends CommonObject
global $user,$langs,$conf;
$error=0;
$trigger=true;
if ($this->id == -1) return -2;
......@@ -591,12 +590,10 @@ class Categorie extends CommonObject
$resql=$this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql) > 0)
{
if ($this->db->num_rows($resql) > 0) {
$objparent = $this->db->fetch_object($resql);
if (!empty($objparent->fk_parent))
{
if (!empty($objparent->fk_parent)) {
$cat = new Categorie($this->db);
$cat->id = $objparent->fk_parent;
......@@ -606,8 +603,7 @@ class Categorie extends CommonObject
$this->error = $cat->error;
$error++;
}
} else {
$trigger=false;
}
}
}
......@@ -629,13 +625,10 @@ class Categorie extends CommonObject
$this->linkto=$obj;
// Call trigger
if ($trigger) {
$result=$this->call_trigger('CATEGORY_LINK',$user);
if ($result < 0) {
$error++;
}
if ($result < 0) { $error++; }
// End call triggers
}
if (! $error)
{
$this->db->commit();
......@@ -650,24 +643,17 @@ class Categorie extends CommonObject
}
else
{
$this->db->rollback();
if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
if (empty($conf->global->CATEGORIE_RECURSIV_ADD)) {
$this->db->rollback();
$this->error=$this->db->lasterrno();
return -3;
}
else {
$this->db->commit();
return 1;
}
}
else
{
$this->db->rollback();
$this->error=$this->db->lasterror();
return -1;
}
return -1;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment