extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fixed not working cache unset on instance level, if called within setup:

Browse Source 
this causes new installed languages to NOT appear"
This commit is contained in:
Ralf Becker 2009-04-28 13:27:18 +00:00
parent b31aa4ae62
commit 7224022772
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
phpgwapi/inc/class.egw_cache.inc.php
View File

@ -242,7 +242,7 @@ class egw_cache
*/ */
static public function unsetInstance($app,$location) static public function unsetInstance($app,$location)
{ {
return self::getCache(self::INSTANCE,$app,$location); return self::unsetCache(self::INSTANCE,$app,$location);
} }
/** /**
@ -434,6 +434,7 @@ class egw_cache
} }
if (!$providers[$level]) error_log(__METHOD__."($level) no provider found ($reason)!"); if (!$providers[$level]) error_log(__METHOD__."($level) no provider found ($reason)!");
} }
//error_log(__METHOD__."($level) = ".array2string($providers[$level]).', cache_provider='.array2string($GLOBALS['egw_info']['server']['cache_provider_'.strtolower($level)]));
return $providers[$level]; return $providers[$level];
} }
@ -457,6 +458,20 @@ class egw_cache
$bases[$level] = $level.'-'.str_replace(array(':','/','\\'),'-',EGW_SERVER_ROOT); $bases[$level] = $level.'-'.str_replace(array(':','/','\\'),'-',EGW_SERVER_ROOT);
break; break;
case self::INSTANCE: case self::INSTANCE:
if(!isset($GLOBALS['egw_info']['server']['install_id']))
{
if (isset($GLOBALS['egw_setup']) && isset($GLOBALS['egw_setup']->db))
{
$GLOBALS['egw_info']['server']['install_id'] = $GLOBALS['egw_setup']->db->select(config::TABLE,'config_value',array(
'config_app' => 'phpgwapi',
'config_name' => 'install_id',
),__LINE__,__FILE__)->fetchColumn();
}
if (!$GLOBALS['egw_info']['server']['install_id'])
{
throw new Exception (__METHOD__."($level,$app,$location) server/install_id is NOT set!");
}
}
$bases[$level] = $level.'-'.$GLOBALS['egw_info']['server']['install_id']; $bases[$level] = $level.'-'.$GLOBALS['egw_info']['server']['install_id'];
break; break;
} }