lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Remove a warning

Browse Source
This commit is contained in:
Laurent Destailleur 2011-01-12 02:43:48 +00:00
parent 93ca7dde30
commit ae31e10dde
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -54,6 +54,7 @@ For users:
- New: Page "supplier summary" is now available. - New: Page "supplier summary" is now available.
- New: Task #10611: Add option to choose order of field in bank account info on PDF - 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: 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 - Perf: Avoid reading database to determine country code after each
page call. page call.
- Fix: Special chars are now supported in ECM module for filename (not yet for - 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: task #9916 : Add FREE text for interventions card.
- New: Can define the new product ref when cloning. - New: Can define the new product ref when cloning.
- New: Project module support status of project and end date. - 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 to check a SIREN for french users.
- New: Add link "now" to fill date when creating invoices. - New: Add link "now" to fill date when creating invoices.
- Fix: Import module works even if prefix is empty in source file. - Fix: Import module works even if prefix is empty in source file.

4
htdocs/user/class/user.class.php
View File

@ -996,7 +996,7 @@ class User extends CommonObject
$this->user_mobile = trim($this->user_mobile); $this->user_mobile = trim($this->user_mobile);
$this->email = trim($this->email); $this->email = trim($this->email);
$this->note = trim($this->note); $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->webcal_login = trim($this->webcal_login);
$this->phenix_login = trim($this->phenix_login); $this->phenix_login = trim($this->phenix_login);
if ($this->phenix_pass != $this->phenix_pass_crypted) if ($this->phenix_pass != $this->phenix_pass_crypted)
@ -1254,7 +1254,7 @@ class User extends CommonObject
$error++; $error++;
} }
} }
dol_syslog("User::setPassword notrigger=".$notrigger." error=".$error,LOG_DEBUG); dol_syslog("User::setPassword notrigger=".$notrigger." error=".$error,LOG_DEBUG);
if (! $error && ! $notrigger) if (! $error && ! $notrigger)