From d1024c9c3678c1fbe51e6e6e410fe337ac0d915a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 2 Oct 2006 13:59:05 +0000 Subject: [PATCH] =?UTF-8?q?Am=E9lioration=20gestion=20erreur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/main.inc.php | 4 ++-- htdocs/user.class.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 74336b8a143..a0f1ba12dd0 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -34,7 +34,7 @@ if (isset($_SERVER['DOL_TUNING'])) $micro_start_time=microtime(true); -// Forcage du parametrage PHP magic_quots_gpc et nettoyage des parametres +// Forcage du parametrage PHP magic_quotes_gpc et nettoyage des parametres // (Sinon il faudrait a chaque POST, conditionner // la lecture de variable par stripslashes selon etat de get_magic_quotes). // En mode off (recommande il faut juste faire addslashes au moment d'un insert/update. @@ -203,7 +203,7 @@ else $result=$user->fetch($login); if ($result <= 0) { - dolibarr_print_error($langs->trans("ErrorCantLoadUserFromDolibarrDatabase")); + dolibarr_print_error($db,$langs->trans("ErrorCantLoadUserFromDolibarrDatabase")); exit; } diff --git a/htdocs/user.class.php b/htdocs/user.class.php index e116d42f0bd..61deee3a7b6 100644 --- a/htdocs/user.class.php +++ b/htdocs/user.class.php @@ -183,7 +183,7 @@ class User { $obj = $this->db->fetch_object($result); $p=$obj->param; - $this->conf->$p = $obj->value; + if ($p) $this->conf->$p = $obj->value; $i++; } $this->db->free($result);