From 232105619b36e58bb6c604379d3af0f06580f4a7 Mon Sep 17 00:00:00 2001 From: Cyrille de Lambert Date: Wed, 17 Aug 2011 13:59:24 +0000 Subject: [PATCH] =?UTF-8?q?Le=20logo=20d=C3=A9pend=20du=20theme=20par=20de?= =?UTF-8?q?faut=20si=20le=20logo=20de=20l'entreprise=20n'est=20pas=20confi?= =?UTF-8?q?gur=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/lib/security.lib.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index 421f552447c..e7d16500620 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -20,7 +20,7 @@ /** * \file htdocs/lib/security.lib.php * \brief Set of function used for dolibarr security - * \version $Id: security.lib.php,v 1.126 2011/08/11 19:41:24 eldy Exp $ + * \version $Id: security.lib.php,v 1.127 2011/08/17 13:59:24 cdelambert Exp $ */ @@ -200,9 +200,14 @@ function dol_loginfunction($langs,$conf,$mysoc) $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=companylogo&file='.urlencode($mysoc->logo); $width=128; } + elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png')) + { + $urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'; + } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')) { $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png'; + } // Entity field