Merge pull request #17817 from colemanw/getChecksConfig

Simplify caching of status checks
civicrm · Jul 27, 2020 · 6010fe3 · 6010fe3
2 parents 27cd872 + 1416a3c
commit 6010fe3
Showing 1 changed file with 5 additions and 18 deletions.
diff --git a/CRM/Utils/Check/Component.php b/CRM/Utils/Check/Component.php
@@ -18,11 +18,6 @@
  */
 abstract class CRM_Utils_Check_Component {
 
-  /**
-   * @var array
-   */
-  public $checksConfig = [];
-
   /**
    * Get the configured status checks.
    *
@@ -32,20 +27,12 @@ abstract class CRM_Utils_Check_Component {
    * @throws \Civi\API\Exception\UnauthorizedException
    */
   public function getChecksConfig() {
-    if (empty($this->checksConfig)) {
-      $this->checksConfig = Civi::cache('checks')->get('checksConfig', []);
-      if (empty($this->checksConfig)) {
-        $this->checksConfig = StatusPreference::get(FALSE)->execute()->indexBy('name');
-      }
+    if (empty(Civi::$statics[__FUNCTION__])) {
+      Civi::$statics[__FUNCTION__] = (array) StatusPreference::get(FALSE)
+        ->addWhere('domain_id', '=', 'current_domain')
+        ->execute()->indexBy('name');
     }
-    return $this->checksConfig;
-  }
-
-  /**
-   * @param array $checksConfig
-   */
-  public function setChecksConfig(array $checksConfig) {
-    $this->checksConfig = $checksConfig;
+    return Civi::$statics[__FUNCTION__];
   }
 
   /**