Merge pull request #1720 from KreizIT/develop

Fix rollback and test errno
2014-07-07 21:23:32 +02:00 · 2014-07-07 21:23:32 +02:00 · 1e28653aa9
commit 1e28653aa9
parent 1a2ed2138b 4e08e2b5d5
1 changed files with 2 additions and 1 deletions
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@ -229,15 +229,16 @@ abstract class CommonObject
        }
        else
        {
-            $this->db->rollback();
            if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
            {
                $this->error=$this->db->errno();
+            	$this->db->rollback();
                return -2;
            }
            else
            {
                $this->error=$this->db->error();
+                $this->db->rollback();
                return -1;
            }
        }