holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few more redirects resulting in unwanted iframes.

Browse Source
This commit is contained in:
Nathan Gray 2014-09-22 16:23:02 +00:00
parent ddc26c361c
commit 06dd8b2adb
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/inc/class.uiconfig.inc.php
View File

@ -153,7 +153,10 @@ class uiconfig
if(!$errors && !$_POST['apply']) if(!$errors && !$_POST['apply'])
{ {
egw_framework::message(lang('Configuration saved.'), 'success'); 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');
} }
} }

5
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -2353,7 +2353,10 @@ class calendar_uiforms extends calendar_ui
} }
if ($button != 'apply') // end dialog 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(); $content= $preserv = array();

5
infolog/inc/class.infolog_customfields.inc.php
View File

@ -89,7 +89,10 @@ class infolog_customfields
} }
// fall through // fall through
case 'cancel': case 'cancel':
egw::redirect_link('/admin/index.php', null, 'admin'); egw::redirect_link('/index.php', array(
'menuaction' => 'admin.admin_ui.index',
'ajax' => 'true'
), 'admin');
} }
} }
else else

5
infolog/inc/class.infolog_ui.inc.php
View File

@ -2396,7 +2396,10 @@ class infolog_ui
if($button == 'save' || $button == 'cancel') if($button == 'save' || $button == 'cancel')
{ {
egw::redirect_link('/admin/index.php', null, 'admin'); egw::redirect_link('/index.php', array(
'menuaction' => 'admin.admin_ui.index',
'ajax' => 'true'
), 'admin');
} }
} }
else else