From c6a52a0b033b4422f81f814726fb12e8c792fbf5 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 3 Mar 2016 10:39:33 +0000 Subject: [PATCH] fix mail/js/app.min.js was not used and etemplate2.min.js included twice --- phpgwapi/inc/class.egw_framework.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 20e6b6a634..9748e326a0 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -2126,7 +2126,7 @@ abstract class egw_framework _debug_array(array_values($to_include)); die('STOP');*/ - return array_values($to_include); + return array_values(array_unique($to_include)); } /** @@ -2158,8 +2158,7 @@ abstract class egw_framework $to_include_first[] = $path . '?' . $mod; } // for now minify does NOT support query parameters, nor php files generating javascript - elseif ($debug_minify || $query || substr($path, -3) != '.js' || - substr($path, -7) == '/app.js') // do NOT include app.js, as it changes from app to app + elseif ($debug_minify || $query || substr($path, -3) != '.js') { $path .= '?'. $mod.($query ? '&'.$query : ''); $to_include[] = $path;