From 7ae02a7c5b3363397e59da540ce4fb88ccdeac2d Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Mon, 28 Mar 2011 14:03:34 +0000
Subject: [PATCH] Enablers for the current setup improvements

SVN:trunk[1150]
---
 core/metamodel.class.php      | 1 +
 setup/setuppage.class.inc.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 12f157c96..8e2cb95be 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -523,6 +523,7 @@ abstract class MetaModel
 			}
 			else
 			{
+				// If the format changes here, do not forget to update the setup index page (detection of installed modules)
 				return self::$m_sTablePrefix.$sTableRaw;
 			}
 		}
diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php
index 3e62f2764..bf00b0590 100644
--- a/setup/setuppage.class.inc.php
+++ b/setup/setuppage.class.inc.php
@@ -269,6 +269,11 @@ table.formTable {
 
 	public static function AddModule($sFilePath, $sId, $aArgs)
 	{
+		if (!array_key_exists('itop_version', $aArgs))
+		{
+			// Assume 1.0.2
+			$aArgs['itop_version'] = '1.0.2';
+		}
 		foreach (self::$m_aModuleArgs as $sArgName => $sArgDesc)
 		{
 			if (!array_key_exists($sArgName, $aArgs))