Project

General

Profile

Bug #40499 » concatenate_css_47.patch

Patch for 4.7.4 - Thomas Löffler, 2012-09-01 11:10

View differences:

t3lib/class.t3lib_compressor.php (revision )
// if $options['baseDirectories'] set, we only include files below these directories
if ((!isset($options['baseDirectories'])
|| $this->checkBaseDirectory($filenameFromMainDir, array_merge($options['baseDirectories'], array($this->targetDirectory))))
&& ($fileOptions['media'] === 'all')
) {
$filesToInclude[] = $filenameFromMainDir;
$filesToInclude[trim($fileOptions['media'])][] = $filenameFromMainDir;
// remove the file from the incoming file array
unset($cssFiles[$key]);
}
}
if (count($filesToInclude)) {
$targetFile = $this->createMergedCssFile($filesToInclude);
foreach ($filesToInclude as $media => $cssFilesToInclude) {
$targetFile = $this->createMergedCssFile($cssFilesToInclude);
$targetFileRelative = $this->relativePath . $targetFile;
$concatenatedOptions = array(
'file' => $targetFileRelative,
'rel' => 'stylesheet',
$targetFileRelative = $this->relativePath . $targetFile;
$concatenatedOptions = array(
'file' => $targetFileRelative,
'rel' => 'stylesheet',
'media' => 'all',
'media' => $media,
'compress' => TRUE,
);
// place the merged stylesheet on top of the stylesheets
$cssFiles = array_merge(array($targetFileRelative => $concatenatedOptions), $cssFiles);
'compress' => TRUE,
);
// place the merged stylesheet on top of the stylesheets
$cssFiles = array_merge(array($targetFileRelative => $concatenatedOptions), $cssFiles);
}
}
return $cssFiles;
}
(2-2/3)