From 4713738ea39863f55ecdbb7c8919268b14a31f3e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 8 Jun 2012 18:17:03 +0200 Subject: [PATCH] Fix: avoid warning --- htdocs/core/lib/files.lib.php | 2 +- htdocs/product/class/product.class.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index e4f415ca130..97bf52a96d1 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -659,7 +659,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$objec //print "x".$file." ".$disableglob; $ok=true; $file_osencoded=dol_osencode($file); // New filename encoded in OS filesystem encoding charset - if (empty($disableglob)) + if (empty($disableglob) && ! empty($file_osencoded)) { foreach (glob($file_osencoded) as $filename) { diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1153e2674fe..afd40ee2c36 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1092,10 +1092,10 @@ class Product extends CommonObject $this->db->free($resql); // multilangs - if ($conf->global->MAIN_MULTILANGS) $this->getMultiLangs(); + if (! empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs(); // Load multiprices array - if ($conf->global->PRODUIT_MULTIPRICES) + if (! empty($conf->global->PRODUIT_MULTIPRICES)) { for ($i=1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {