From 699b614ac1e5a0567d8619a883e4096224fb64ed Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 14 Jan 2014 17:59:33 +0000
Subject: [PATCH] re-adding cache buster to javascript urls, if
 debug_minify=True

---
 phpgwapi/inc/class.egw_framework.inc.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index ec9df7e736..f49d05d19e 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -1621,20 +1621,18 @@ abstract class egw_framework
 	 */
 	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();
-		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();
 		foreach($js_includes as $file)
 		{