allow to overide egw_server_root used as key in egw_cache for tree- AND instance-level

This commit is contained in:
Ralf Becker 2015-10-10 10:37:07 +00:00
parent 60a5fec6a0
commit b56467a0c5

View File

@ -89,6 +89,13 @@ class egw_cache
*/ */
static $max_expiration; static $max_expiration;
/**
* Used to determine keys for tree- and instance-level caches
*
* @var string
*/
static $egw_server_root = EGW_SERVER_ROOT;
/** /**
* Set some data in the cache * Set some data in the cache
* *
@ -639,7 +646,7 @@ class egw_cache
case self::TREE: case self::TREE:
if (!isset($tree_key)) if (!isset($tree_key))
{ {
$tree_key = $level.'-'.str_replace(array(':','/','\\'),'-',EGW_SERVER_ROOT); $tree_key = $level.'-'.str_replace(array(':','/','\\'),'-', self::$egw_server_root);
// add charset to key, if not utf-8 (as everything we store depends on charset!) // add charset to key, if not utf-8 (as everything we store depends on charset!)
if (($charset = self::get_system_config('system_charset',false)) && $charset != 'utf-8') if (($charset = self::get_system_config('system_charset',false)) && $charset != 'utf-8')
{ {