From 76a76beb69a537c62207bee056ef228c1061d841 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 22 Sep 2014 15:25:23 +0000 Subject: [PATCH] Fix a few more redirects resulting in unwanted iframes. --- admin/inc/class.uiconfig.inc.php | 5 ++++- calendar/inc/class.calendar_uiforms.inc.php | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/admin/inc/class.uiconfig.inc.php b/admin/inc/class.uiconfig.inc.php index a2be0f5dc3..1829bf5a79 100644 --- a/admin/inc/class.uiconfig.inc.php +++ b/admin/inc/class.uiconfig.inc.php @@ -153,7 +153,10 @@ class uiconfig if(!$errors && !$_POST['apply']) { egw_framework::message(lang('Configuration saved.'), 'success'); - egw::redirect_link('/admin/index.php', null, 'admin'); + egw::redirect_link('/index.php', array( + 'menuaction' => 'admin.admin_ui.index', + 'ajax' => 'true' + ), 'admin'); } } diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index c7ac6308da..fa52578611 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -2353,7 +2353,10 @@ class calendar_uiforms extends calendar_ui } if ($button != 'apply') // end dialog { - egw::redirect_link('/admin/index.php', null, 'admin'); + egw::redirect_link('/index.php', array( + 'menuaction' => 'admin.admin_ui.index', + 'ajax' => 'true' + ), 'admin'); } } $content= $preserv = array();