From 0b47ef1b3b2ded45f92a55ff42e8b1336986c85d Mon Sep 17 00:00:00 2001 From: gRoussac Date: Fri, 15 Nov 2013 10:51:46 +0100 Subject: [PATCH] [-] BO : test on xml string follow up https://github.com/PrestaShop/PrestaShop/pull/690#issuecomment-28542506 --- classes/controller/AdminController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 8fc40f79f..18b742196 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1542,12 +1542,14 @@ class AdminControllerCore extends Controller if (!$this->isFresh(Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST, 86400)) file_put_contents(_PS_ROOT_DIR_.Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST, Tools::addonsRequest('native')); + libxml_use_internal_errors(true); $country_module_list = file_get_contents(_PS_ROOT_DIR_.Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST); - if (!empty($country_module_list) && $country_module_list_xml = simplexml_load_string($country_module_list)) + if (!empty($country_module_list) && is_string($country_module_list) && $country_module_list_xml = simplexml_load_string($country_module_list)) { $country_module_list_array = array(); - foreach ($country_module_list_xml->module as $k => $m) - $country_module_list_array[] = (string)$m->name; + if (is_array($country_module_list_xml->module)) + foreach ($country_module_list_xml->module as $k => $m) + $country_module_list_array[] = (string)$m->name; $this->tab_modules_list['slider_list'] = array_intersect($this->tab_modules_list['slider_list'], $country_module_list_array); }