From 6b5cbfb64e72af5c3c0ffefa7a2719a372d8ea5d Mon Sep 17 00:00:00 2001 From: vdumas Date: Fri, 26 Mar 2021 09:14:03 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B0463=20-=20Load=20localized=20Query=20Phr?= =?UTF-8?q?ases=20at=20Setup=20(2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- datamodels/2.x/itop-tickets/module.itop-tickets.php | 2 +- setup/xmldataloader.class.inc.php | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/datamodels/2.x/itop-tickets/module.itop-tickets.php b/datamodels/2.x/itop-tickets/module.itop-tickets.php index 679ac5e88..eab6932eb 100755 --- a/datamodels/2.x/itop-tickets/module.itop-tickets.php +++ b/datamodels/2.x/itop-tickets/module.itop-tickets.php @@ -73,7 +73,7 @@ class TicketsInstaller extends ModuleInstallerAPI // Without test, new entries added to the data files, would be automatically loaded if (($sPreviousVersion === '') || (version_compare($sPreviousVersion, $sCurrentVersion, '<') - and version_compare($sPreviousVersion, '3.0.1', '<'))) { + && version_compare($sPreviousVersion, '3.0.1', '<'))) { $oDataLoader = new XMLDataLoader(); CMDBObject::SetTrackInfo("Initialization"); diff --git a/setup/xmldataloader.class.inc.php b/setup/xmldataloader.class.inc.php index 5f609a183..6197becd0 100644 --- a/setup/xmldataloader.class.inc.php +++ b/setup/xmldataloader.class.inc.php @@ -165,12 +165,9 @@ class XMLDataLoader */ protected function ClearKeysCache() { - if(is_file($this->m_sCacheFileName)) - { + if (is_file($this->m_sCacheFileName)) { unlink($this->m_sCacheFileName); - } - else - { + } else { //echo "

Hm, it looks like the file does not exist!!!

"; } $this->m_aKeys = array();