From 8208135c5e044e8a0d0e9b74ba72d7de22b201ea Mon Sep 17 00:00:00 2001 From: fSerny Date: Thu, 2 Feb 2012 15:30:34 +0000 Subject: [PATCH] // Small fix --- classes/Module.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/classes/Module.php b/classes/Module.php index 2d5216367..cf4f129f0 100644 --- a/classes/Module.php +++ b/classes/Module.php @@ -839,9 +839,19 @@ abstract class ModuleCore libxml_use_internal_errors(true); $xml_module = simplexml_load_file($configFile); foreach (libxml_get_errors() as $error) + { + libxml_clear_errors(); return 'Module '.ucfirst($module); + } libxml_clear_errors(); + // Find translations + global $_MODULES; + $file = _PS_MODULE_DIR_.$module.'/'.Context::getContext()->language->iso_code.'.php'; + if (Tools::file_exists_cache($file) && include_once($file)) + if (isset($_MODULE) && is_array($_MODULE)) + $_MODULES = !empty($_MODULES) ? array_merge($_MODULES, $_MODULE) : $_MODULE; + // Return Name return Module::findTranslation($xml_module->name, Module::configXmlStringFormat($xml_module->displayName), (string)$xml_module->name); }