From 318c9da5b841a9ea2a64314ec3a9fac25a0cb1f5 Mon Sep 17 00:00:00 2001 From: Cyrille de Lambert Date: Fri, 19 Aug 2011 15:52:20 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20possibilit=C3=A9=20d'avoir=20?= =?UTF-8?q?l'image=20du=20th=C3=A8me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/user/passwordforgotten.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index 0fdf01b9607..c73960e9a53 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -19,7 +19,7 @@ /** * \file htdocs/user/passwordforgotten.php * \brief Page to ask a new password - * \version $Id: passwordforgotten.php,v 1.77 2011/08/17 15:56:25 eldy Exp $ + * \version $Id: passwordforgotten.php,v 1.78 2011/08/19 15:52:20 cdelambert Exp $ */ define("NOLOGIN",1); // This means this output page does not require to be logged. @@ -192,7 +192,6 @@ if ($conf->global->MAIN_SECURITY_ENABLE_SENDPASSWORD) $disabled=''; // To force $width=0; $rowspan=2; $urllogo=DOL_URL_ROOT.'/theme/login_logo.png'; - if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) { $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=companylogo&file='.urlencode('thumbs/'.$mysoc->logo_small); @@ -201,9 +200,11 @@ elseif (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output. { $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=companylogo&file='.urlencode($mysoc->logo); $width=128; -} -elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')) -{ +}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'; }