From ae097502ac6d9896382263363b79897de2731998 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 15 May 2017 09:55:29 -0600 Subject: [PATCH] Fix custom notifications CKEditor was broken, depending on how you loaded Admin --- infolog/inc/class.infolog_hooks.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/infolog/inc/class.infolog_hooks.inc.php b/infolog/inc/class.infolog_hooks.inc.php index 6f87116b5c..ea064d2133 100644 --- a/infolog/inc/class.infolog_hooks.inc.php +++ b/infolog/inc/class.infolog_hooks.inc.php @@ -111,7 +111,9 @@ class infolog_hooks $file = Array( 'Site configuration' => Egw::link('/index.php',array( 'menuaction' => 'infolog.infolog_ui.admin', - 'ajax' => 'true', + // As long as CKEditor needs CSP exceptions, this needs to + // load in an iframe + //'ajax' => 'true', )), 'Global Categories' => Egw::link('/index.php',array( 'menuaction' => 'admin.admin_categories.index',