do NOT check eT2 popups for missing framework

EGroupware · May 19, 2020 · d04e6eb · d04e6eb
1 parent 9b17fa7
commit d04e6eb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/api/src/Framework/Ajax.php b/api/src/Framework/Ajax.php
@@ -248,7 +248,8 @@ function header(array $extra=array())
 			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