holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mail/js/app.min.js was not used and etemplate2.min.js included twice

Browse Source
This commit is contained in:
Ralf Becker 2016-03-03 10:39:33 +00:00
parent b0f061ac5e
commit c6a52a0b03
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -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;