tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Respect module stylesheets again when generating the ETag 

fixes #11465
This commit is contained in:
Eric Lippmann 2016-03-29 11:39:41 +02:00
parent 6e28b4690e
commit c7aec8ae64
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/Icinga/Web/LessCompiler.php
View File

@ -70,7 +70,7 @@ class LessCompiler
*/
public function addLessFile($lessFile)
{
$this->lessFiles[] = $lessFile;
$this->lessFiles[] = realpath($lessFile);
return $this;
}
@ -87,7 +87,7 @@ class LessCompiler
if (! isset($this->moduleLessFiles[$moduleName])) {
$this->moduleLessFiles[$moduleName] = array();
}
$this->moduleLessFiles[$moduleName][] = $lessFile;
$this->moduleLessFiles[$moduleName][] = realpath($lessFile);
return $this;
}
@ -98,9 +98,12 @@ class LessCompiler
*/
public function getLessFiles()
{
$lessFiles = iterator_to_array(new RecursiveIteratorIterator(new RecursiveArrayIterator(
$this->lessFiles + $this->moduleLessFiles
)));
$lessFiles = $this->lessFiles;
foreach ($this->moduleLessFiles as $moduleLessFiles) {
$lessFiles = array_merge($lessFiles, $moduleLessFiles);
}
if ($this->theme !== null) {
$lessFiles[] = $this->theme;
}