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

Fix: Removed errors with not defined vars

Browse Source
This commit is contained in:
Laurent Destailleur 2013-05-24 14:32:12 +02:00
parent 3b6c55f908
commit 7bbdae239f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/get_menudiv.php
View File

@ -45,6 +45,8 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
* View * View
*/ */
$title=$langs->trans("Menu");
// URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests // URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests
$arrayofjs=array(); $arrayofjs=array();
$arrayofcss=array(); $arrayofcss=array();

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

@ -1113,7 +1113,10 @@ class User extends CommonObject
$this->note = trim($this->note); $this->note = trim($this->note);
$this->openid = trim(empty($this->openid)?'':$this->openid); // Avoid warning $this->openid = trim(empty($this->openid)?'':$this->openid); // Avoid warning
$this->admin = $this->admin?$this->admin:0; $this->admin = $this->admin?$this->admin:0;
$this->address = empty($this->address)?'':$this->address;
$this->zip = empty($this->zip)?'':$this->zip;
$this->town = empty($this->town)?'':$this->town;
// Check parameters // Check parameters
if (! empty($conf->global->USER_MAIL_REQUIRED) && ! isValidEMail($this->email)) if (! empty($conf->global->USER_MAIL_REQUIRED) && ! isValidEMail($this->email))
{ {
@ -1133,8 +1136,8 @@ class User extends CommonObject
$sql.= ", address = '".$this->db->escape($this->address)."'"; $sql.= ", address = '".$this->db->escape($this->address)."'";
$sql.= ", zip = '".$this->db->escape($this->zip)."'"; $sql.= ", zip = '".$this->db->escape($this->zip)."'";
$sql.= ", town = '".$this->db->escape($this->town)."'"; $sql.= ", town = '".$this->db->escape($this->town)."'";
$sql.= ", fk_state = ".($this->state_id > 0?"'".$this->db->escape($this->state_id)."'":"null"); $sql.= ", fk_state = ".((! empty($this->state_id) && $this->state_id > 0)?"'".$this->db->escape($this->state_id)."'":"null");
$sql.= ", fk_country = ".($this->country_id > 0?"'".$this->db->escape($this->country_id)."'":"null"); $sql.= ", fk_country = ".((! empty($this->country_id) && $this->country_id > 0)?"'".$this->db->escape($this->country_id)."'":"null");
$sql.= ", office_phone = '".$this->db->escape($this->office_phone)."'"; $sql.= ", office_phone = '".$this->db->escape($this->office_phone)."'";
$sql.= ", office_fax = '".$this->db->escape($this->office_fax)."'"; $sql.= ", office_fax = '".$this->db->escape($this->office_fax)."'";
$sql.= ", user_mobile = '".$this->db->escape($this->user_mobile)."'"; $sql.= ", user_mobile = '".$this->db->escape($this->user_mobile)."'";