From 0c669115c99a9b9db2f3894f86d023adb6c4a479 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Mon, 20 Aug 2012 08:35:59 +0000 Subject: [PATCH] // Fixed potential warning on homepage #PSCFV-3678 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16904 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminHomeController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 5a490e7d9..fa309f7a8 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -537,11 +537,10 @@ class AdminHomeControllerCore extends AdminController file_put_contents('../config/xml/preactivation.xml', $content); } + $count = 0; + libxml_use_internal_errors(true); // If preactivation xml file exists, we load it - if (file_exists('../config/xml/preactivation.xml')) - { - $count = 0; - $preactivation = @simplexml_load_file('../config/xml/preactivation.xml'); + if (file_exists('../config/xml/preactivation.xml') && $preactivation = simplexml_load_file('../config/xml/preactivation.xml')) foreach ($preactivation->partner as $partner) { // Cache the logo @@ -580,7 +579,8 @@ class AdminHomeControllerCore extends AdminController $count++; } } - } + libxml_clear_errors(); + if (!empty($return)) $return .= '