From 15ec93f468a4c57543ee4dbe20246b69b2fa13be Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Dec 2007 18:39:08 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Logo=20non=20affich=E9=20si=20logo=20soc?= =?UTF-8?q?i=E9t=E9=20upload=E9=20puis=20effac=E9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/lib/functions.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index d38468180c5..c1a13d28d0e 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -1405,7 +1405,7 @@ function dol_loginfunction($notused,$pearstatus) print ''; if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png')) { - // Cas qui ne devrait pas arriver (pour compatibilité) + // TODO A virer Cas qui ne devrait pas arriver (pour compatibilité) print ''; } @@ -1430,11 +1430,11 @@ function dol_loginfunction($notused,$pearstatus) // Show logo (search in order: small company logo, large company logo, theme logo, common logo) $width=0; $urllogo=DOL_URL_ROOT.'/theme/login_logo.png'; - if (is_readable($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small)) + if (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small)) { $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&file='.urlencode('/thumbs/'.$mysoc->logo_small); } - elseif (is_readable($conf->societe->dir_logos.'/'.$mysoc->logo)) + elseif (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_logos.'/'.$mysoc->logo)) { $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&file='.urlencode($mysoc->logo); $width=96;
'; print '