From 089a9fcf4a40b386b81416b762e746fd6f325a00 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Wed, 6 Apr 2011 18:42:27 +0000
Subject: [PATCH] - Make sure that the data (smaples and structure) from hidden
 modules are loaded as well. (Symptom: sample EmailNotifications were not
 loaded)

- Make sure that the "synchrodatasource" file gets loaded as part of the "standard" app modules, even when upgrading "in-place" an existing iTop configuration file.

SVN:trunk[1185]
---
 setup/index.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setup/index.php b/setup/index.php
index 1fca62c9e..f88d1cee8 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -417,7 +417,7 @@ function PopulateDataFilesList(SetupWebPage $oP, $aParamValues, $oConfig)
 
 	foreach($aAvailableModules as $sModuleId => $aModule)
 	{
-		if (($sModuleId != ROOT_MODULE) && $aModule['visible'])
+		if (($sModuleId != ROOT_MODULE))
 		{
 			if (in_array($sModuleId, $aParamValues['module']))
 			{
@@ -504,6 +504,11 @@ function BuildConfig(SetupWebpage $oP, Config &$oConfig, $aParamValues, $aAvaila
 	// Initialize the arrays below with default values for the application...
 	$aAddOns = $oConfig->GetAddOns();
 	$aAppModules = $oConfig->GetAppModules();
+	// New module in 1.1: synchro, when migrating an *old* configuration file to 1.1 the module may be missing
+	if (!in_array('synchro/synchrodatasource.class.inc.php', $aAppModules))
+	{
+		$aAppModules[] = 'synchro/synchrodatasource.class.inc.php';
+	}
 	$aDataModels = $oConfig->GetDataModels();
 	$aWebServiceCategories = $oConfig->GetWebServiceCategories();
 	$aDictionaries = $oConfig->GetDictionaries();