extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix infinit recursion, when creating new bundles, caused by max_modified not calculated

Browse Source
This commit is contained in:
Ralf Becker 2016-04-30 17:05:00 +00:00
parent b06fc3f3e1
commit 70e084972a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Framework/Bundle.php
View File

@ -143,6 +143,7 @@ class Bundle
unset($query); unset($query);
list($path,$query) = explode('?',$path,2); list($path,$query) = explode('?',$path,2);
$mod = filemtime(EGW_SERVER_ROOT.$path); $mod = filemtime(EGW_SERVER_ROOT.$path);
if ($mod > $max_modified) $max_modified = $mod;
// ckeditor must be included before bundled files, as they depend on it! // ckeditor must be included before bundled files, as they depend on it!
if (strpos($path,'/ckeditor/ckeditor.js') !== false) if (strpos($path,'/ckeditor/ckeditor.js') !== false)
@ -157,7 +158,6 @@ class Bundle
} }
else else
{ {
if ($mod > $max_modified) $max_modified = $mod;
$to_minify[] = substr($path,1); $to_minify[] = substr($path,1);
} }
} }