From 75624376a525a4e819c62e2adb42da9726fd7bc3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 00:27:19 +0200
Subject: [PATCH] FIX Warnings
---
htdocs/core/lib/files.lib.php | 10 +++++-----
htdocs/core/lib/images.lib.php | 5 +++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 3fa17aa8bcf..06df150d983 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -72,11 +72,11 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
$reshook = 0;
$file_list = array();
- $hookmanager->resArray=array();
-
- if (! $nohook)
+ if (is_object($hookmanager) && ! $nohook)
{
- $hookmanager->initHooks(array('fileslib'));
+ $hookmanager->resArray=array();
+
+ $hookmanager->initHooks(array('fileslib'));
$parameters=array(
'path' => $newpath,
@@ -197,7 +197,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
}
}
- $file_list = array_merge($file_list, $hookmanager->resArray);
+ if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
return $file_list;
}
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index acfa917720e..d9d7d0d9730 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -38,7 +38,7 @@ $quality = 80;
function image_format_supported($file)
{
$regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm'; // See also into product.class.php
-
+
// Case filename is not a format image
if (! preg_match('/('.$regeximgext.')$/i',$file,$reg)) return -1;
@@ -90,7 +90,7 @@ function dol_getImageSize($file, $url = false)
$ret['width']=$infoImg[0]; // Largeur de l'image
$ret['height']=$infoImg[1]; // Hauteur de l'image
}
-
+
return $ret;
}
@@ -438,6 +438,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
dol_mkdir($dirthumb);
// Initialisation des variables selon l'extension de l'image
+ $img=null;
switch($infoImg[2])
{
case IMAGETYPE_GIF: // 1
--
GitLab