diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-05-16 19:21:45 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-05-16 19:21:45 +0000 |
| commit | 589ec7b7583c4810da9f366a80bca84bcaafe415 (patch) | |
| tree | 140611ab49c3c9dad67db68a1378e0c593d4960c | |
| parent | 83cd78c95f7089e0e947ca75f991e96267e15577 (diff) | |
| download | brdo-589ec7b7583c4810da9f366a80bca84bcaafe415.tar.gz brdo-589ec7b7583c4810da9f366a80bca84bcaafe415.tar.bz2 | |
- Patch #796048 by jbafford: drupal_build_js_cache() improperly merged JS files in some cases.
| -rw-r--r-- | includes/common.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc index acc37479e..57bff0233 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -4323,8 +4323,8 @@ function drupal_build_js_cache($files) { // Build aggregate JS file. foreach ($files as $path => $info) { if ($info['preprocess']) { - // Append a ';' after each JS file to prevent them from running together. - $contents .= file_get_contents($path) . ';'; + // Append a ';' and a newline after each JS file to prevent them from running together. + $contents .= file_get_contents($path) . ";\n"; } } // Prefix filename to prevent blocking by firewalls which reject files |