From 554f466ed4d306e0c4dd763c6104ffe7f5ebe861 Mon Sep 17 00:00:00 2001
From: jessylenne <jessy.lenne@live.fr>
Date: Sat, 24 Nov 2012 18:08:27 +0100
Subject: [PATCH] Update classes/Mail.php

lang.php inclusion path correction
- In case of theme directory use
- In case of override/classes/Mail.php use
---
 classes/Mail.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Mail.php b/classes/Mail.php
index 5296db846..d64118514 100644
--- a/classes/Mail.php
+++ b/classes/Mail.php
@@ -214,10 +214,10 @@ class MailCore
 
 			if ($override_mail && file_exists($template_path.$iso.'/lang.php'))
 					include_once($template_path.$iso.'/lang.php');
-			else if ($module_name && file_exists($template_path.$iso.'/lang.php'))
+			else if ($module_name && file_exists($theme_path.'mails/'.$iso.'/lang.php'))
 				include_once($theme_path.'mails/'.$iso.'/lang.php');
 			else
-				include_once(dirname(__FILE__).'/../mails/'.$iso.'/lang.php');
+				include_once(_MAIL_DIR_.$iso.'/lang.php');
 
 			/* Create mail and attach differents parts */
 			$message = new Swift_Message('['.Configuration::get('PS_SHOP_NAME').'] '.$subject);