From 915940e51a9f09d38c756ec7b193b7a77b9e140d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 2 Jun 2014 15:03:23 +0000 Subject: [PATCH] fixed not working account-selection popup --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 9557734a3a..8fe752e196 100755 --- a/index.php +++ b/index.php @@ -97,14 +97,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' && !($GLOBALS['egw']->framework instanceof jdots_framework)) +if ($app == 'home' && !$api_requested && !($GLOBALS['egw']->framework instanceof jdots_framework)) { $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); } // until home works again, we build new frameset for jdots template -if ($app == 'home' && $GLOBALS['egw']->framework instanceof jdots_framework) $_GET['cd'] = 'yes'; +if ($app == 'home' && !$api_requested && $GLOBALS['egw']->framework instanceof jdots_framework) $_GET['cd'] = 'yes'; if($app == 'home' && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !html::$ua_mobile)) {