extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 19:39:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

do NOT check eT2 popups for missing framework

Browse Source
This commit is contained in:
Ralf Becker 2020-05-19 09:02:47 +02:00
parent 9b17fa7871
commit d04e6ebdec
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/Framework/Ajax.php
View File

@ -248,7 +248,8 @@ abstract class Ajax extends Api\Framework
if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('manual', 'login', 'logout', 'sitemgr'))) 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']=''; 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 // allow apps to load JavaScript or CSS files, knowing we're loading the framework or not