From 4b9e6edab8f4561d3cd22eee8a3f5e277f83f07a Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Tue, 8 Oct 2013 12:46:37 +0000 Subject: [PATCH] File identifiers are no longer numeric only ! SVN:trunk[2881] --- setup/compiler.class.inc.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php index 2566f384d..3392ae190 100644 --- a/setup/compiler.class.inc.php +++ b/setup/compiler.class.inc.php @@ -1526,19 +1526,19 @@ EOF; $oFileRefs = $oNode->GetNodes(".//fileref"); foreach ($oFileRefs as $oFileRef) { - $iFileId = $oFileRef->getAttribute('ref'); - if ($iFileId > 0) + $sFileId = $oFileRef->getAttribute('ref'); + if ($sFileId !== '') { - $oNodes = $this->oFactory->GetNodes("/itop_design/files/file[@id='$iFileId']"); + $oNodes = $this->oFactory->GetNodes("/itop_design/files/file[@id='$sFileId']"); if ($oNodes->length == 0) { - throw new DOMFormatException('Could not find the file with ref '.$iFileId); + throw new DOMFormatException('Could not find the file with ref '.$sFileId); } $sName = $oNodes->item(0)->GetChildText('name'); $sData = base64_decode($oNodes->item(0)->GetChildText('data')); $aPathInfo = pathinfo($sName); - $sFile = 'icon-file'.$iFileId.'.'.$aPathInfo['extension']; + $sFile = $sFileId.'.'.$aPathInfo['extension']; $sFilePath = $sTempTargetDir.'/images/'.$sFile; @mkdir($sTempTargetDir.'/images'); file_put_contents($sFilePath, $sData); @@ -1598,4 +1598,4 @@ EOF; } } -?> \ No newline at end of file +?>