From c4af9d4d02857c72d31f4fdd3dad1ca1678aba77 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 7 Feb 2012 17:02:23 +0100 Subject: [PATCH] Fix: merge problem --- htdocs/core/class/commonobject.class.php | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 0182bea4b94..df46828fed6 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1653,30 +1653,6 @@ abstract class CommonObject return -1; } } - - /** - * Delete all links between an object $this - * - * @return int >0 if OK, <0 if KO - */ - function deleteObjectLinked() - { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element"; - $sql.= " WHERE fk_target = ".$this->id; - $sql.= " AND targettype = '".$this->element."'"; - - dol_syslog(get_class($this)."::deleteObjectLinked sql=".$sql, LOG_DEBUG); - if ($this->db->query($sql)) - { - return 1; - } - else - { - $this->error=$this->db->lasterror(); - dol_syslog(get_class($this)."::deleteObjectLinked error=".$this->error, LOG_ERR); - return -1; - } - } /** * Set statut of an object