merged branch beberlei/ConfigFileLoaderTypeMissing (PR #5193)
Commits -------b3cf36a
[Config] Missing type argument passed to loader. Discussion ---------- [Config] Missing type argument passed to loader. In FileLoader the $type is not passed to the child loader. Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes License of the code: MIT --------------------------------------------------------------------------- by travisbot at 2012-08-06T14:22:30Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2047982) (mergedb3cf36af
into89dce2df
).
This commit is contained in:
commit
3d32a0bcc2
@ -72,7 +72,7 @@ abstract class FileLoader extends Loader
|
|||||||
}
|
}
|
||||||
self::$loading[$resource] = true;
|
self::$loading[$resource] = true;
|
||||||
|
|
||||||
$ret = $loader->load($resource);
|
$ret = $loader->load($resource, $type);
|
||||||
|
|
||||||
unset(self::$loading[$resource]);
|
unset(self::$loading[$resource]);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user