+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018 |
+ | Copyright CiviCRM LLC (c) 2004-2019 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
*/
class CRM_Core_OptionGroup {
static $_values = array();
return self::$_cache[$cacheKey];
}
// Fetch from main cache
- $var = $cache->get($cacheKey);
- if ($var) {
- return $var;
+ self::$_cache[$cacheKey] = $cache->get($cacheKey);
+ if (self::$_cache[$cacheKey] !== NULL) {
+ return self::$_cache[$cacheKey];
}
}
/**
* @return string
*/
- protected static function createCacheKey() {
- $cacheKey = "CRM_OG_" . serialize(func_get_args());
+ protected static function createCacheKey($id) {
+ $cacheKey = "CRM_OG_" . preg_replace('/[^a-zA-Z0-9]/', '', $id) . '_' . md5(serialize(func_get_args()));
return $cacheKey;
}
$cache = CRM_Utils_Cache::singleton();
if (!$fresh) {
- $var = $cache->get($cacheKey);
- if ($var) {
- return $var;
+ self::$_cache[$cacheKey] = $cache->get($cacheKey);
+ if (self::$_cache[$cacheKey] !== NULL) {
+ return self::$_cache[$cacheKey];
}
}
$query = "