composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.5' into develop

Browse Source 
# Conflicts:
#	application/startup.inc.php
This commit is contained in:
Eric
2018-09-17 11:47:47 +02:00
parent 3ea16694b4 27332931d0
commit 7edff12bbf
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
application/startup.inc.php
View File

@@ -50,10 +50,23 @@ require_once(APPROOT.'/core/contexttag.class.inc.php');
session_name('itop-'.md5(APPROOT)); session_name('itop-'.md5(APPROOT));
session_start(); session_start();
$sSwitchEnv = utils::ReadParam('switch_env', null); $sSwitchEnv = utils::ReadParam('switch_env', null);
if (($sSwitchEnv != null) && (file_exists(APPCONF.$sSwitchEnv.'/'.ITOP_CONFIG_FILE))) $bAllowCache = true;
if (($sSwitchEnv != null) && (file_exists(APPCONF.$sSwitchEnv.'/'.ITOP_CONFIG_FILE)) && isset($_SESSION['itop_env']) && ($_SESSION['itop_env'] !== $sSwitchEnv))
{ {
$_SESSION['itop_env'] = $sSwitchEnv; $_SESSION['itop_env'] = $sSwitchEnv;
$sEnv = $sSwitchEnv; $sEnv = $sSwitchEnv;
$bAllowCache = false;
// Reset the opcache since otherwise the PHP "model" files may still be cached !!
if (function_exists('opcache_reset'))
{
// Zend opcode cache
opcache_reset();
}
if (function_exists('apc_clear_cache'))
{
// APC(u) cache
apc_clear_cache();
}
// TODO: reset the credentials as well ?? // TODO: reset the credentials as well ??
} }
else if (isset($_SESSION['itop_env'])) else if (isset($_SESSION['itop_env']))
@@ -66,4 +79,4 @@ else
$_SESSION['itop_env'] = ITOP_DEFAULT_ENV; $_SESSION['itop_env'] = ITOP_DEFAULT_ENV;
} }
$sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE; $sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
MetaModel::Startup($sConfigFile, false /* $bModelOnly */, true /* $bAllowCache */, false /* $bTraceSourceFiles */, $sEnv); MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);