extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 02:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix implementation of calling (set|get|unset)Cache with install_id to behave identical to call to (set|get|unset)Instance for current instances install_id (install_id was used directly in keys)

Browse Source
This commit is contained in:
Ralf Becker 2014-05-22 11:21:29 +00:00
parent 669d77bc40
commit fb2fe616b5
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -589,17 +589,21 @@ class egw_cache
/** /**
* Generate a new instance key and by doing so effectivly flushes whole instance cache * Generate a new instance key and by doing so effectivly flushes whole instance cache
* *
* @param string $install_id=null default use install_id of current instance
* @return string new key also stored in self::$instance_key * @return string new key also stored in self::$instance_key
*/ */
static public function generate_instance_key() static public function generate_instance_key($install_id=null)
{ {
$install_id = self::get_system_config('install_id'); if (!isset($install_id))
{
self::$instance_key = null;
$install_id = self::get_system_config('install_id');
}
$instance_key = self::INSTANCE.'-'.$install_id.'-'.microtime(true);
self::setTree(__CLASS__, $install_id, $instance_key);
self::$instance_key = self::INSTANCE.'-'.$install_id.'-'.microtime(true); //error_log(__METHOD__."(install_id='$install_id') returning '".$instance_key."'");
self::setTree(__CLASS__, $install_id, self::$instance_key); return $instance_key;
//error_log(__METHOD__."() install_id='$install_id' returning '".self::$instance_key."'");
return self::$instance_key;
} }
/** /**
@ -628,18 +632,23 @@ class egw_cache
} }
$level_key = $tree_key; $level_key = $tree_key;
break; break;
default: // arbitrary install_id given --> check for current instance
if ($level !== $GLOBALS['egw_info']['server']['install_id'])
{
$level_key = self::getTree(__CLASS__, $level);
if (!isset($level_key)) $level_key = self::generate_instance_key($level);
break;
}
// fall-through for current instance
case self::INSTANCE: case self::INSTANCE:
if (!isset(self::$instance_key)) if (!isset(self::$instance_key))
{ {
self::$instance_key = self::getTree(__CLASS__, self::get_system_config('install_id')); self::$instance_key = self::getTree(__CLASS__, self::get_system_config('install_id'));
//error_log(__METHOD__."('$level',...) instance_key read from tree-cache=".array2string(self::$instance_key)); //error_log(__METHOD__."('$level',...) instance_key read from tree-cache=".array2string(self::$instance_key));
if (!isset(self::$instance_key)) self::generate_instance_key(); if (!isset(self::$instance_key)) self::$instance_key = self::generate_instance_key();
} }
$level_key = self::$instance_key; $level_key = self::$instance_key;
break; break;
default:
$level_key = $level;
break;
} }
return array($level_key, $app, $location); return array($level_key, $app, $location);
} }