From 3fe9c78c2690e85f15933e30c3cb00b014fe6d7a Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 10 Jan 2014 16:58:50 +0000 Subject: [PATCH] do NOT load egw.js a second time via minifyier --- phpgwapi/inc/class.egw_framework.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 0b6f99a80f..4ac9141ef5 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -1604,6 +1604,8 @@ abstract class egw_framework $max_modified = 0; foreach(self::$js_include_mgr->get_included_files($clear_files) as $path) { + if ($path == '/phpgwapi/js/jsapi/egw.js') continue; // loaded via own tag, and we must not load it twice! + $query = ''; list($path,$query) = explode('?',$path,2); if (($mod = filemtime(EGW_SERVER_ROOT.$path)) > $max_modified) $max_modified = $mod;