[Pkg-owncloud-commits] [owncloud] 200/258: Add CssImportFilter. More elegant fix for documents#348

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit e0d1fa554f85bd73ba69aff54d895e38c776175e
Author: Victor Dubiniuk <victor.dubiniuk at gmail.com>
Date:   Mon Oct 6 19:39:02 2014 +0300

    Add CssImportFilter. More elegant fix for documents#348
---
 lib/private/templatelayout.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index a5dd9a0..2bd7f69 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 at thisnet.nl>
@@ -163,7 +164,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");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git