From 76f970967fe8c9747bd24c09e6bba0a5f05d3491 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 22 Sep 2014 15:23:36 +0000
Subject: [PATCH] Fix a few more redirects resulting in unwanted iframes.

---
 infolog/inc/class.infolog_customfields.inc.php | 5 ++++-
 infolog/inc/class.infolog_ui.inc.php           | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/infolog/inc/class.infolog_customfields.inc.php b/infolog/inc/class.infolog_customfields.inc.php
index 3c0a270ea8..28a291c1cb 100644
--- a/infolog/inc/class.infolog_customfields.inc.php
+++ b/infolog/inc/class.infolog_customfields.inc.php
@@ -89,7 +89,10 @@ class infolog_customfields
 					}
 					// fall through
 				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
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index a56897db7c..12741f94be 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -2396,7 +2396,10 @@ class infolog_ui
 
 			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