mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-26 23:21:49 +01:00
fix for bug [ 899867 ] Broken login page in RC3
This commit is contained in:
parent
c7daab6c2b
commit
f94019a0c3
@ -354,7 +354,7 @@
|
||||
$tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']);
|
||||
$tmpl->set_var('bg_color',($GLOBALS['phpgw_info']['server']['login_bg_color']?$GLOBALS['phpgw_info']['server']['login_bg_color']:'FFFFFF'));
|
||||
$tmpl->set_var('bg_color_title',($GLOBALS['phpgw_info']['server']['login_bg_color_title']?$GLOBALS['phpgw_info']['server']['login_bg_color_title']:'486591'));
|
||||
$tmpl->set_var('logo_url',($GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.egroupware.org'));
|
||||
$tmpl->set_var('logo_url',($GLOBALS['phpgw_info']['server']['login_logo_url']?'http://'.$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.egroupware.org'));
|
||||
|
||||
// retrieve logo from login template set
|
||||
// FIXME $GLOBALS['phpgw']->common->image must get extra argument: force to look in this template set thirst
|
||||
@ -363,6 +363,9 @@
|
||||
|
||||
if($GLOBALS['phpgw_info']['server']['login_logo_file'])
|
||||
{
|
||||
// the find_image function does require this information
|
||||
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] =
|
||||
$GLOBALS['phpgw_info']['login_template_set'];
|
||||
$tmpl->set_var('logo_file',$GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']));
|
||||
}
|
||||
elseif(getimagesize($template_logo_real))
|
||||
|
Loading…
Reference in New Issue
Block a user