Skip to content

Commit

Permalink
merged branch beberlei/ConfigFileLoaderTypeMissing (PR #5193)
Browse files Browse the repository at this point in the history
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) (merged b3cf36a into 89dce2d).
  • Loading branch information
fabpot committed Aug 6, 2012
2 parents 89dce2d + b3cf36a commit 3d32a0b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Symfony/Component/Config/Loader/FileLoader.php
Expand Up @@ -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]);

Expand Down

0 comments on commit 3d32a0b

Please sign in to comment.