From a7ed74c97dc169c849041e8f89af9c3e89e7433a Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Sat, 17 Jan 2004 17:28:28 +0000 Subject: [PATCH] Ensure getimagesize() is run on the real file location --- login.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/login.php b/login.php index 1bf16f7187..39c08d2e33 100755 --- a/login.php +++ b/login.php @@ -344,13 +344,14 @@ // retrieve logo from login template set // FIXME $GLOBALS['phpgw']->common->image must get extra argument: force to look in this template set thirst - $template_logo_file=$GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/templates/'.$GLOBALS['phpgw_info']['login_template_set'].'/images/logo.png'; + $template_logo_file = $GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/templates/'.$GLOBALS['phpgw_info']['login_template_set'].'/images/logo.png'; + $template_logo_real = PHPGW_SERVER_ROOT . '/phpgwapi/templates/'.$GLOBALS['phpgw_info']['login_template_set'].'/images/logo.png'; if($GLOBALS['phpgw_info']['server']['login_logo_file']) { $tmpl->set_var('logo_file',$GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file'])); } - elseif(getimagesize($template_logo_file)) + elseif(getimagesize($template_logo_real)) { $tmpl->set_var('logo_file',$template_logo_file); }