merged 2.0

fabpot · fabpot · commit 9dd23af46362 · 2012-08-10T13:48:23.000+02:00
diff --git a/Loader/FileLoader.php b/Loader/FileLoader.php
@@ -72,7 +72,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
             }
             self::$loading[$resource] = true;
 
-            $ret = $loader->load($resource);
+            $ret = $loader->load($resource, $type);
 
             unset(self::$loading[$resource]);
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe`
`72`	`72`	`}`
`73`	`73`	`self::$loading[$resource] = true;`
`74`	`74`
`75`		`- $ret = $loader->load($resource);`
	`75`	`+ $ret = $loader->load($resource, $type);`
`76`	`76`
`77`	`77`	`unset(self::$loading[$resource]);`
`78`	`78`