Skip to content
Snippets Groups Projects
Commit 75624376 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

FIX Warnings

parent b441c62e
Branches
Tags
No related merge requests found
...@@ -72,10 +72,10 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil ...@@ -72,10 +72,10 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
$reshook = 0; $reshook = 0;
$file_list = array(); $file_list = array();
if (is_object($hookmanager) && ! $nohook)
{
$hookmanager->resArray=array(); $hookmanager->resArray=array();
if (! $nohook)
{
$hookmanager->initHooks(array('fileslib')); $hookmanager->initHooks(array('fileslib'));
$parameters=array( $parameters=array(
...@@ -197,7 +197,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil ...@@ -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; return $file_list;
} }
......
...@@ -438,6 +438,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $ ...@@ -438,6 +438,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
dol_mkdir($dirthumb); dol_mkdir($dirthumb);
// Initialisation des variables selon l'extension de l'image // Initialisation des variables selon l'extension de l'image
$img=null;
switch($infoImg[2]) switch($infoImg[2])
{ {
case IMAGETYPE_GIF: // 1 case IMAGETYPE_GIF: // 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment