diff --git a/index.php b/index.php index e2bd655fae..6b38056a70 100755 --- a/index.php +++ b/index.php @@ -96,6 +96,14 @@ if(@file_exists($tpl_info)) } } +// 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') +{ + $app = $GLOBALS['egw_info']['user']['preferences']['common']['default_app']; + if (!$app || $app == 'home') $app = isset($GLOBALS['egw_info']['user']['apps']['calendar']) ? 'calendar' : key($GLOBALS['egw_info']['user']['apps']); + egw::redirect(egw_framework::index($app, $app)); +} + if($app == 'home' && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !html::$ua_mobile)) { if ($GLOBALS['egw_info']['server']['force_default_app'] && $GLOBALS['egw_info']['server']['force_default_app'] != 'user_choice') diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 5ff2d0356f..e11ae18b4f 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -894,6 +894,8 @@ abstract class egw_framework $apps = array(); foreach($GLOBALS['egw_info']['user']['apps'] as $app => $data) { +// disable home until we get it working again +if ($app == 'home') continue; if (is_long($app)) { continue;