[BUGFIX] Fix JS concat if first file is forced on top 93/27793/6
authorBenjamin Kott <info@bk2k.info>
Sun, 23 Feb 2014 12:00:32 +0000 (13:00 +0100)
committerBenjamin Mack <benni@typo3.org>
Mon, 24 Feb 2014 20:11:50 +0000 (21:11 +0100)
If a javascript file is forceOnTop the script uses array_unshift()
to put the file at the beginning of the section array. If this is
the first file that got processed, the array does not exist yet,
so the array_unshift function returns NULL and the file
will not added to the array.

The fix properly initalizes the section sub-array.

Resolves: #56242
Releases: 6.2, 6.1
Change-Id: I23af7862263fb0685032c34ded8736df87ddeb99
Reviewed-on: https://review.typo3.org/27793
Reviewed-by: Markus Klein
Tested-by: Markus Klein
Reviewed-by: Benjamin Mack
Tested-by: Benjamin Mack
typo3/sysext/core/Classes/Resource/ResourceCompressor.php

index a9980a2..15a2241 100644 (file)
@@ -227,6 +227,9 @@ class ResourceCompressor {
                        if (empty($fileOptions['section']) || !empty($fileOptions['excludeFromConcatenation'])) {
                                continue;
                        }
+                       if (!isset($filesToInclude[$fileOptions['section']])) {
+                               $filesToInclude[$fileOptions['section']] = array();
+                       }
                        // we remove BACK_PATH from $filename, so make it relative to root path
                        $filenameFromMainDir = $this->getFilenameFromMainDir($fileOptions['file']);
                        if ($fileOptions['forceOnTop']) {