From 6cd77f75c900945bfc5f00ed9e72ce41de32f63c Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 30 Mar 2011 20:46:19 +0200
Subject: [PATCH] [SwiftmailerBundle] removed obsolete parameter

---
 .../DependencyInjection/SwiftmailerExtension.php                | 2 +-
 .../Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
index 4d836c7cf1..135fd96f18 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
+++ b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
@@ -46,7 +46,7 @@ class SwiftmailerExtension extends Extension
         $container->setAlias('mailer', 'swiftmailer.mailer');
 
         $r = new \ReflectionClass('Swift_Message');
-        $container->getDefinition('swiftmailer.mailer')->setFile(dirname(dirname(dirname($r->getFilename()))));
+        $container->getDefinition('swiftmailer.mailer')->setFile(dirname(dirname(dirname($r->getFilename()))).'/swift_init.php');
 
         $configuration = new Configuration();
         $processor = new Processor();
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
index 1e691e3bd5..334f806297 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
+++ b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
@@ -12,8 +12,6 @@
 
         <parameter key="swiftmailer.transport.failover.class">Swift_Transport_FailoverTransport</parameter>
 
-        <parameter key="swiftmailer.init_file">%swiftmailer.base_dir%/swift_init.php</parameter>
-
         <parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter>
         <parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter>
         <parameter key="swiftmailer.plugin.messagelogger.class">Symfony\Bundle\SwiftmailerBundle\Logger\MessageLogger</parameter>