From fccd101e8828b35bb4e3dfe56f2eb4d6026d9ef3 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Wed, 4 Apr 2012 13:57:00 +0000 Subject: [PATCH] [-] BO : #PSTEST-1130 : fix bug object mail virtual product git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14457 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Mail.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/Mail.php b/classes/Mail.php index 22e5f41e7..861d62e04 100644 --- a/classes/Mail.php +++ b/classes/Mail.php @@ -271,11 +271,13 @@ class MailCore if ($id_lang == null) $id_lang = (!isset($context->language) || !is_object($context->language)) ? (int)Configuration::get('PS_LANG_DEFAULT') : (int)$context->language->id; - $file_core = _PS_ROOT_DIR_.'/mails/'.$context->language->iso_code.'/lang.php'; + $iso_code = Language::getIsoById((int)$id_lang); + + $file_core = _PS_ROOT_DIR_.'/mails/'.$iso_code.'/lang.php'; if (Tools::file_exists_cache($file_core) && empty($_LANGMAIL)) include_once($file_core); - $file_theme = _PS_THEME_DIR_.'mails/'.$context->language->iso_code.'/lang.php'; + $file_theme = _PS_THEME_DIR_.'mails/'.$iso_code.'/lang.php'; if (Tools::file_exists_cache($file_theme)) include_once($file_theme);