From 949ef79227d38bba898be1fd8119512dd4b0245d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 24 Mar 2019 14:26:16 +0100
Subject: [PATCH] Better error message

---
 htdocs/core/lib/files.lib.php     | 3 ++-
 htdocs/core/lib/functions.lib.php | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 2d9b44e51ae..06fa4d84f1c 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1834,7 +1834,8 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '')
 		try {
 		    $ret = $image->readImage($fileinput);
 		} catch(Exception $e) {
-		    dol_syslog("Failed to read image using Imagick (Try to install package 'apt-get install ghostscript'): ".$e->getMessage(), LOG_WARNING);
+		    $ext = pathinfo($fileinput, PATHINFO_EXTENSION);
+		    dol_syslog("Failed to read image using Imagick (Try to install package 'apt-get install php-imagick ghostscript' and check there is no policy to disable ".$ext." convertion in /etc/ImageMagick*/policy.xml): ".$e->getMessage(), LOG_WARNING);
 			return 0;
 		}
 		if ($ret)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7a699ee22a4..bb6cc1d81d6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1393,7 +1393,6 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					// If PDF file exists
 					if (file_exists($file))
 					{
-						$encfile = urlencode($file);
 						// Conversion du PDF en image png si fichier png non existant
 						if ( (! file_exists($fileimage) || (filemtime($fileimage) < filemtime($file)))
 						  && (! file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file)))