diff options
author | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2014-10-06 19:39:02 +0300 |
---|---|---|
committer | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2014-10-06 19:39:02 +0300 |
commit | b6087ea79be774fc12166b876a865643011c5749 (patch) | |
tree | 79a65f09fc837287961dea69ce7d6e2b3027ffa3 /lib/private/templatelayout.php | |
parent | a6293a38f20ef9393b7ec01dbdb8c34191b32011 (diff) | |
download | nextcloud-server-b6087ea79be774fc12166b876a865643011c5749.tar.gz nextcloud-server-b6087ea79be774fc12166b876a865643011c5749.zip |
Add CssImportFilter. More elegant fix for documents#348
Diffstat (limited to 'lib/private/templatelayout.php')
-rw-r--r-- | lib/private/templatelayout.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 7ac0bd97abe..e9172fd2da5 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -3,6 +3,7 @@ use Assetic\Asset\AssetCollection; use Assetic\Asset\FileAsset; use Assetic\AssetWriter; use Assetic\Filter\CssRewriteFilter; +use Assetic\Filter\CssImportFilter; /** * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl> @@ -167,7 +168,15 @@ class OC_TemplateLayout extends OC_Template { $assetPath = $root . '/' . $file; $sourceRoot = \OC::$SERVERROOT; $sourcePath = substr($assetPath, strlen(\OC::$SERVERROOT)); - return new FileAsset($assetPath, array(new CssRewriteFilter()), $sourceRoot, $sourcePath); + return new FileAsset( + $assetPath, + array( + new CssRewriteFilter(), + new CssImportFilter() + ), + $sourceRoot, + $sourcePath + ); }, $cssFiles); $cssCollection = new AssetCollection($cssFiles); $cssCollection->setTargetPath("assets/$cssHash.css"); |