diff --git a/phpgwapi/inc/class.egw.inc.php b/phpgwapi/inc/class.egw.inc.php index 5b8763c5af..22f20f3b20 100644 --- a/phpgwapi/inc/class.egw.inc.php +++ b/phpgwapi/inc/class.egw.inc.php @@ -331,12 +331,7 @@ class egw extends egw_minimal if (egw_session::get_sessionid()) $redirect .= 'cd=10&'; } if ($relpath) $redirect .= 'phpgw_forward='.urlencode($relpath.(!empty($query) ? '?'.$query : '')); - //Header('Location: '.$GLOBALS['egw_info']['server']['webserver_url'].$redirect); - // do NOT redirect, but set top.location, as this works in framed template too - $redirect = $GLOBALS['egw_info']['server']['webserver_url'].$redirect; - - echo "\n\n\n\n"; - exit; + self::redirect_link($redirect); } } diff --git a/phpgwapi/js/login.js b/phpgwapi/js/login.js index 26820641fb..26e5862b70 100644 --- a/phpgwapi/js/login.js +++ b/phpgwapi/js/login.js @@ -8,6 +8,9 @@ * @version $Id$ */ +/* if login page is not in top window, set top windows location to it */ +if (top !== window) top.location = window.location; + egw_LAB.wait(function() { $j(document).ready(function()