Fixed the "Reset(APC)Cache" at the end of the installation.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2310 a333f486-631f-4898-b8df-5754b55c2be0

core/metamodel.class.php

@@ -5076,18 +5076,18 @@ abstract class MetaModel
 		return $aEntries;
 	}
 
-	public static function ResetCache($sEnvironment = null)
+	public static function ResetCache($sEnvironmentId = null)
 	{
 		if (!function_exists('apc_delete')) return;
-		if (is_null($sEnvironment))
+		if (is_null($sEnvironmentId))
 		{
-			$sEnvironment = MetaModel::GetEnvironmentId();
+			$sEnvironmentId = MetaModel::GetEnvironmentId();
 		}
 
-		$sAppIdentity = 'itop-'.$sEnvironment;
+		$sAppIdentity = 'itop-'.$sEnvironmentId;
 		Dict::ResetCache($sAppIdentity);
 
-		foreach(self::GetCacheEntries($sEnvironment) as $sKey => $aAPCInfo)
+		foreach(self::GetCacheEntries($sEnvironmentId) as $sKey => $aAPCInfo)
 		{
 			$sAPCKey = $aAPCInfo['info'];
 			apc_delete($sAPCKey);

setup/applicationinstaller.class.inc.php

@@ -783,6 +783,6 @@ class ApplicationInstaller
 
 		// Ready to go !!
 		require_once(APPROOT.'core/dict.class.inc.php');
-		MetaModel::ResetCache($sTargetEnvironment);
+		MetaModel::ResetCache();
 	}
 }