From d04e6ebdece344dc5075ec1980e26d80f0205259 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 19 May 2020 09:02:47 +0200 Subject: [PATCH] do NOT check eT2 popups for missing framework --- api/src/Framework/Ajax.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/Framework/Ajax.php b/api/src/Framework/Ajax.php index 52d671677e..5c020c58df 100755 --- a/api/src/Framework/Ajax.php +++ b/api/src/Framework/Ajax.php @@ -248,7 +248,8 @@ abstract class Ajax extends Api\Framework if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('manual', 'login', 'logout', 'sitemgr'))) { if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script']=''; - $extra['check-framework'] = $_GET['cd'] !== 'no'; + // eT2 sets $GLOBALS['egw_info']['flags']['nonavbar'] === 'popup' for popups, Etemplate::exec($outputmode === 2) + $extra['check-framework'] = $_GET['cd'] !== 'no' && $GLOBALS['egw_info']['flags']['nonavbar'] !== 'popup'; } } // allow apps to load JavaScript or CSS files, knowing we're loading the framework or not