Merge branch 'develop' into submodule

Patrick Kleinschmidt · Patrick Kleinschmidt · commit fe10c0059544 · 2014-11-07T21:39:47.000+01:00
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -1978,7 +1978,7 @@ public function findImport($url)
         $urls = array();
 
         // for "normal" scss imports (ignore vanilla css and external requests)
-        if (!preg_match('/\.css|^http:\/\/$/', $url)) {
+        if (!preg_match('/\.css$|^http:\/\//', $url)) {
             // try both normal and the _partial filename
             $urls = array($url, preg_replace('/[^\/]+$/', '_\0', $url));
         }

Original file line number	Diff line number	Diff line change
`@@ -1978,7 +1978,7 @@ public function findImport($url)`
`1978`	`1978`	`$urls = array();`
`1979`	`1979`
`1980`	`1980`	`// for "normal" scss imports (ignore vanilla css and external requests)`
`1981`		`- if (!preg_match('/\.css\|^http:\/\/$/', $url)) {`
	`1981`	`+ if (!preg_match('/\.css$\|^http:\/\//', $url)) {`
`1982`	`1982`	`// try both normal and the _partial filename`
`1983`	`1983`	`$urls = array($url, preg_replace('/[^\/]+$/', '_\0', $url));`
`1984`	`1984`	`}`