projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15614 from seamuslee001/convert_case_date_jcalendar
[civicrm-core.git]
/
CRM
/
Case
/
PseudoConstant.php
diff --git
a/CRM/Case/PseudoConstant.php
b/CRM/Case/PseudoConstant.php
index 7cc943acfa58a61c075c8f4d274fc191b5d02425..a1bb966de8f85f15c4e79046851351dc716abb98 100644
(file)
--- a/
CRM/Case/PseudoConstant.php
+++ b/
CRM/Case/PseudoConstant.php
@@
-36,12
+36,6
@@
*/
class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
*/
class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
- /**
- * Activity type
- * @var array
- */
- public static $activityTypeList = [];
-
/**
* Get all the case statues.
*
/**
* Get all the case statues.
*
@@
-155,8
+149,8
@@
class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
public static function &caseActivityType($indexName = TRUE, $all = FALSE) {
$cache = (int) $indexName . '_' . (int) $all;
public static function &caseActivityType($indexName = TRUE, $all = FALSE) {
$cache = (int) $indexName . '_' . (int) $all;
- if (!
array_key_exists($cache, self::$activityTypeList
)) {
-
self::$activityTypeList
[$cache] = [];
+ if (!
isset(Civi::$statics[__CLASS__]['activityTypeList'][$cache]
)) {
+
Civi::$statics[__CLASS__]['activityTypeList']
[$cache] = [];
$query = "
SELECT v.label as label ,v.value as value, v.name as name, v.description as description, v.icon
$query = "
SELECT v.label as label ,v.value as value, v.name as name, v.description as description, v.icon
@@
-194,9
+188,9
@@
class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
$activityTypes[$index]['icon'] = $dao->icon;
$activityTypes[$index]['description'] = $dao->description;
}
$activityTypes[$index]['icon'] = $dao->icon;
$activityTypes[$index]['description'] = $dao->description;
}
-
self::$activityTypeList
[$cache] = $activityTypes;
+
Civi::$statics[__CLASS__]['activityTypeList']
[$cache] = $activityTypes;
}
}
- return
self::$activityTypeList
[$cache];
+ return
Civi::$statics[__CLASS__]['activityTypeList']
[$cache];
}
/**
}
/**