From 50610bc92b526499a49ae3c6539c89c28ceda4e8 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 10 Jun 2010 10:37:23 +0200
Subject: [PATCH] [SwiftmailerBundle] removed the need for adding the
 swiftmailer path to the include path

---
 .../DependencyInjection/SwiftmailerExtension.php               | 3 +++
 .../SwiftmailerBundle/Resources/config/swiftmailer.xml         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Framework/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php b/src/Symfony/Framework/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
index eae01bba57..571a74e820 100644
--- a/src/Symfony/Framework/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
+++ b/src/Symfony/Framework/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
@@ -52,6 +52,9 @@ class SwiftMailerExtension extends LoaderExtension
             $configuration->setAlias('mailer', 'swiftmailer.mailer');
         }
 
+        $r = new \ReflectionClass('Swift_Message');
+        $configuration->setParameter('swiftmailer.base_dir', dirname(dirname(dirname($r->getFilename()))));
+
         $transport = $configuration->getParameter('swiftmailer.transport.name');
         if (array_key_exists('transport', $config)) {
             if (null === $config['transport']) {
diff --git a/src/Symfony/Framework/SwiftmailerBundle/Resources/config/swiftmailer.xml b/src/Symfony/Framework/SwiftmailerBundle/Resources/config/swiftmailer.xml
index e1c77e91e5..d3c2ec1c44 100644
--- a/src/Symfony/Framework/SwiftmailerBundle/Resources/config/swiftmailer.xml
+++ b/src/Symfony/Framework/SwiftmailerBundle/Resources/config/swiftmailer.xml
@@ -22,7 +22,7 @@
     <parameter key="swiftmailer.transport.failover.class">Swift_Transport_FailoverTransport</parameter>
     <parameter key="swiftmailer.spool.file.class">Swift_FileSpool</parameter>
 
-    <parameter key="swiftmailer.init_file">swift_init.php</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>