From ae31e10dde003cf19d86de41804849cebce302d1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 12 Jan 2011 02:43:48 +0000 Subject: [PATCH] Fix: Remove a warning --- ChangeLog | 3 ++- htdocs/user/class/user.class.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9b84af5fc5..48e2e1de266 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ For users: - New: Page "supplier summary" is now available. - New: Task #10611: Add option to choose order of field in bank account info on PDF - New: If a transaction was reconciliated and should not, there was no way to reverse error. +- New: Ubuntu package now works also on debian. - Perf: Avoid reading database to determine country code after each page call. - Fix: Special chars are now supported in ECM module for filename (not yet for @@ -235,7 +236,7 @@ For users: - New: task #9916 : Add FREE text for interventions card. - New: Can define the new product ref when cloning. - New: Project module support status of project and end date. -- New: Provide a debian/ubuntu package. +- New: Provide a ubuntu package. - New: Add link to check a SIREN for french users. - New: Add link "now" to fill date when creating invoices. - Fix: Import module works even if prefix is empty in source file. diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 4450fe02cdd..8e817f92ba4 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -996,7 +996,7 @@ class User extends CommonObject $this->user_mobile = trim($this->user_mobile); $this->email = trim($this->email); $this->note = trim($this->note); - $this->openid = trim($this->openid); + $this->openid = trim(empty($this->openid)?'':$this->openid); // Avoid warning $this->webcal_login = trim($this->webcal_login); $this->phenix_login = trim($this->phenix_login); if ($this->phenix_pass != $this->phenix_pass_crypted) @@ -1254,7 +1254,7 @@ class User extends CommonObject $error++; } } - + dol_syslog("User::setPassword notrigger=".$notrigger." error=".$error,LOG_DEBUG); if (! $error && ! $notrigger)