mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-23 16:33:17 +01:00
* Framework: fix broken favicon
This commit is contained in:
parent
8c20a46652
commit
680ebd15c5
@ -485,15 +485,7 @@ abstract class Framework extends Framework\Extra
|
|||||||
|
|
||||||
if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots ='<meta name="robots" content="none" />';
|
if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots ='<meta name="robots" content="none" />';
|
||||||
|
|
||||||
if (substr($GLOBALS['egw_info']['server']['favicon_file'],0,4) == 'http')
|
$var['favicon_file'] = self::get_login_logo_or_bg_url('favicon_file', 'favicon.ico');
|
||||||
{
|
|
||||||
$var['favicon_file'] = $GLOBALS['egw_info']['server']['favicon_file'];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$var['favicon_file'] = Image::find('api', $GLOBALS['egw_info']['server']['favicon_file'] ?
|
|
||||||
$GLOBALS['egw_info']['server']['favicon_file'] : 'favicon.ico');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($GLOBALS['egw_info']['flags']['include_wz_tooltip'] &&
|
if ($GLOBALS['egw_info']['flags']['include_wz_tooltip'] &&
|
||||||
file_exists(EGW_SERVER_ROOT.($wz_tooltip = '/phpgwapi/js/wz_tooltip/wz_tooltip.js')))
|
file_exists(EGW_SERVER_ROOT.($wz_tooltip = '/phpgwapi/js/wz_tooltip/wz_tooltip.js')))
|
||||||
|
Loading…
Reference in New Issue
Block a user