浏览代码

[Swiftmailer] Set a null value for swiftmailer.single_address if delivery_address is not specified

Francis Besset 14 年之前
父节点
当前提交
186b8d39cd
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php

+ 3 - 1
src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php

@@ -95,9 +95,11 @@ class SwiftMailerExtension extends Extension
             $config['delivery_address'] = $config['delivery-address'];
         }
 
-        if (isset($config['delivery_address'])) {
+        if (isset($config['delivery_address']) && $config['delivery_address']) {
             $container->setParameter('swiftmailer.single_address', $config['delivery_address']);
             $container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.redirecting')));
+        } else {
+            $container->setParameter('swiftmailer.single_address', null);
         }
 
         if (array_key_exists('disable-delivery', $config)) {