From 135abdb9e0bad66822f048ee6113bbc43baec00c Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Sat, 20 Oct 2012 15:42:39 +0000 Subject: [PATCH] Fixed the "Reset(APC)Cache" at the end of the installation. SVN:trunk[2310] --- core/metamodel.class.php | 10 +++++----- setup/applicationinstaller.class.inc.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/metamodel.class.php b/core/metamodel.class.php index 2ffb81037..8d747bfa7 100644 --- a/core/metamodel.class.php +++ b/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); diff --git a/setup/applicationinstaller.class.inc.php b/setup/applicationinstaller.class.inc.php index a7eb117c9..ad62758ab 100644 --- a/setup/applicationinstaller.class.inc.php +++ b/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(); } }