Merge pull request #1044 from prestamodule/development

Mail translation methods fix & template translation fix
2013-11-28 00:08:54 -08:00
parent 13061bdc04 2b37db629e
commit ccc388fab9
3 changed files with 4 additions and 4 deletions
@@ -372,11 +372,11 @@ class MailCore

 		$file_core = _PS_ROOT_DIR_.'/mails/'.$iso_code.'/lang.php';
 		if (Tools::file_exists_cache($file_core) && empty($_LANGMAIL))
-			include_once($file_core);
+			include($file_core);

 		$file_theme = _PS_THEME_DIR_.'mails/'.$iso_code.'/lang.php';
 		if (Tools::file_exists_cache($file_theme))
-			include_once($file_theme);
+			include($file_theme);

 		if (!is_array($_LANGMAIL))
 			return (str_replace('"', '&quot;', $string));