revert previous changes to avoid felamimail as default_app, as it should be handled on update/upgrade

This commit is contained in:
Klaus Leithoff 2014-06-13 11:51:44 +00:00
parent b9038925a8
commit e6a6b271e3

View File

@ -96,18 +96,6 @@ if(@file_exists($tpl_info))
}
}
// try to switch to mail on startup, if felamimail was called
if ($GLOBALS['egw_info']['user']['preferences']['common']['default_app']=='felamimail' && !isset($GLOBALS['egw_info']['user']['apps']['felamimail']) && isset($GLOBALS['egw_info']['user']['apps']['mail']))
{
$GLOBALS['egw_info']['user']['preferences']['common']['default_app'] ='mail';
if (isset($GLOBALS['egw']->preferences))
{
$GLOBALS['egw']->preferences->add('common','default_app','mail','user');
// save prefs
$GLOBALS['egw']->preferences->save_repository(true);
}
}
// until home works again, we redirect to default_app from prefs (if set and not home) or calendar, if allowed, or first app found
if ($app == 'home' && !$api_requested && !($GLOBALS['egw']->framework instanceof jdots_framework))
{