浏览代码

XML: compilation error if there is no tag module_designs (completes revisions 3820 and 3861 which introduced the issue)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3870 a333f486-631f-4898-b8df-5754b55c2be0
romainq 9 年之前
父节点
当前提交
d98746b5ef
共有 1 个文件被更改,包括 11 次插入8 次删除
  1. 11 8
      setup/compiler.class.inc.php

+ 11 - 8
setup/compiler.class.inc.php

@@ -2277,14 +2277,17 @@ EOF;
 	
 	protected function CompileModuleDesigns($oDesigns, $sTempTargetDir, $sFinalTargetDir)
 	{
-		SetupUtils::builddir($sTempTargetDir.'/core/module_designs/images');
-		$this->CompileFiles($oDesigns, $sTempTargetDir.'/core/module_designs', $sFinalTargetDir.'/core/module_designs', 'core/module_designs');
-		foreach ($oDesigns->GetNodes('module_design') as $oDesign)
-		{
-			$oDoc = new ModuleDesign();
-			$oClone = $oDoc->importNode($oDesign->cloneNode(true), true);
-			$oDoc->appendChild($oClone);
-			$oDoc->save($sTempTargetDir.'/core/module_designs/'.$oDesign->getAttribute('id').'.xml');
+		if ($oDesigns)
+		{
+			SetupUtils::builddir($sTempTargetDir.'/core/module_designs/images');
+			$this->CompileFiles($oDesigns, $sTempTargetDir.'/core/module_designs', $sFinalTargetDir.'/core/module_designs', 'core/module_designs');
+			foreach ($oDesigns->GetNodes('module_design') as $oDesign)
+			{
+				$oDoc = new ModuleDesign();
+				$oClone = $oDoc->importNode($oDesign->cloneNode(true), true);
+				$oDoc->appendChild($oClone);
+				$oDoc->save($sTempTargetDir.'/core/module_designs/'.$oDesign->getAttribute('id').'.xml');
+			}
 		}
 	}