From b2d33e0806be32a895c166c546b97ec61c585cf5 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 29 Oct 2009 07:07:48 +0000 Subject: [PATCH] Fix: bad value in delete last line --- htdocs/fichinter/fichinter.class.php | 2 +- htdocs/lib/security.lib.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/fichinter/fichinter.class.php b/htdocs/fichinter/fichinter.class.php index ffb3211222f..81c3098e97a 100644 --- a/htdocs/fichinter/fichinter.class.php +++ b/htdocs/fichinter/fichinter.class.php @@ -970,7 +970,7 @@ class FichinterLigne { $obj=$this->db->fetch_object($resql); $total_duration=0; - if ($obj) $total_duration = $obj->total_duration; + if (!empty($obj->total_duration)) $total_duration = $obj->total_duration; $sql = "UPDATE ".MAIN_DB_PREFIX."fichinter"; $sql.= " SET duree = ".$total_duration; diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index 2f9c19b6c12..d1d3fa262f1 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -136,6 +136,7 @@ function dol_loginfunction($langs,$conf,$mysoc) $demopassword=$tab[1]; } + // Entity cookie if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) { $lastuser = '';