Преглед на файлове

Merge remote branch 'kriswallsmith/assetic/filter-pass-fix'

* kriswallsmith/assetic/filter-pass-fix:
  [AsseticBundle] fixed previous PR
Fabien Potencier преди 14 години
родител
ревизия
122a61b5cc
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/CheckClosureFilterPass.php

+ 3 - 1
src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/CheckClosureFilterPass.php

@@ -23,7 +23,9 @@ class CheckClosureFilterPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        if ($container->hasDefinition('assetic.filter.closure.jar') && $container->hasParameter('assetic.filter.closure.jar')) {
+        if ($container->hasDefinition('assetic.filter.closure.jar')
+            && $container->hasParameter('assetic.filter.closure.jar')
+            && $container->getParameterBag()->resolveValue($container->getParameter('assetic.filter.closure.jar'))) {
             $container->removeDefinition('assetic.filter.closure.api');
         } elseif ($container->hasDefinition('assetic.filter.closure.api')) {
             $container->removeDefinition('assetic.filter.closure.jar');