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

re-adding cache buster to javascript urls, if debug_minify=True

Browse Source
This commit is contained in:
Ralf Becker 2014-01-14 17:59:33 +00:00
parent 93ccf400c3
commit 699b614ac1
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1621,20 +1621,18 @@ abstract class egw_framework
*/ */
public static function bundle_js_includes(array $js_includes) public static function bundle_js_includes(array $js_includes)
{ {
if ($GLOBALS['egw_info']['server']['debug_minify'] === 'True')
{
return $js_includes; // nothing to do, just return all single files
}
// get used bundles and cache them on tree-level for 2h
$bundles = egw_cache::getTree(__CLASS__, 'bundles', array(__CLASS__, 'get_bundles'), array(), 7200);
$bundles_ts = $bundles['.ts'];
unset($bundles['.ts']);
$file2bundle = array(); $file2bundle = array();
foreach($bundles as $name => $files) if ($GLOBALS['egw_info']['server']['debug_minify'] !== 'True')
{ {
$file2bundle += array_combine($files, array_fill(0, count($files), $name)); // get used bundles and cache them on tree-level for 2h
$bundles = egw_cache::getTree(__CLASS__, 'bundles', array(__CLASS__, 'get_bundles'), array(), 7200);
$bundles_ts = $bundles['.ts'];
unset($bundles['.ts']);
foreach($bundles as $name => $files)
{
$file2bundle += array_combine($files, array_fill(0, count($files), $name));
}
} }
$to_include = $included_bundles = array(); $to_include = $included_bundles = array();
foreach($js_includes as $file) foreach($js_includes as $file)
{ {