Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

merge-requests/26/head
Dries Buytaert 2010-05-16 19:21:45 +00:00
parent 83cd78c95f
commit 589ec7b758
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/common.inc
View File

@ -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