From 470d0749a5b7e99ebafc999d45fd84b239922aac Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 3 Sep 2011 16:37:12 +0000
Subject: [PATCH] uniformize code

---
 htdocs/user/class/user.class.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 78285c8d9a1..8016b45440b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1150,21 +1150,22 @@ class User extends CommonObject
 			if (! $error)
 			{
 				$this->db->commit();
+				return $nbrowsaffected;
 			}
 			else
 			{
+				$this->error=$this->db->lasterror();
+				dol_syslog(get_class($this)."::update error=".$this->error,LOG_ERR);
 				$this->db->rollback();
+				return -1;
 			}
-
-			return $nbrowsaffected;
 		}
 		else
 		{
-			$this->db->rollback();
-
 			$this->error=$this->db->lasterror();
-			dol_syslog("User::update ".$this->error,LOG_ERR);
-			return -1;
+			dol_syslog(get_class($this)."::update error=".$this->error,LOG_ERR);
+			$this->db->rollback();
+			return -2;
 		}
 
 	}