Commit 589ec7b7 authored by Dries's avatar Dries

- Patch #796048 by jbafford: drupal_build_js_cache() improperly merged JS files in some cases.

parent 83cd78c9
...@@ -4323,8 +4323,8 @@ function drupal_build_js_cache($files) { ...@@ -4323,8 +4323,8 @@ function drupal_build_js_cache($files) {
// Build aggregate JS file. // Build aggregate JS file.
foreach ($files as $path => $info) { foreach ($files as $path => $info) {
if ($info['preprocess']) { if ($info['preprocess']) {
// Append a ';' after each JS file to prevent them from running together. // Append a ';' and a newline after each JS file to prevent them from running together.
$contents .= file_get_contents($path) . ';'; $contents .= file_get_contents($path) . ";\n";
} }
} }
// Prefix filename to prevent blocking by firewalls which reject files // Prefix filename to prevent blocking by firewalls which reject files
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment