From 70e084972a01b63f310148ee0ea4a28edd720e16 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 30 Apr 2016 17:05:00 +0000 Subject: [PATCH] fix infinit recursion, when creating new bundles, caused by max_modified not calculated --- api/src/Framework/Bundle.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/Framework/Bundle.php b/api/src/Framework/Bundle.php index c71bdb9541..c8959f4f60 100644 --- a/api/src/Framework/Bundle.php +++ b/api/src/Framework/Bundle.php @@ -143,6 +143,7 @@ class Bundle unset($query); list($path,$query) = explode('?',$path,2); $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! if (strpos($path,'/ckeditor/ckeditor.js') !== false) @@ -157,7 +158,6 @@ class Bundle } else { - if ($mod > $max_modified) $max_modified = $mod; $to_minify[] = substr($path,1); } }