Merge pull request #19063 from christianwach/lab-core-2213

[civicrm-core.git] / CRM / Utils / Check / Component.php

diff --git a/CRM/Utils/Check/Component.php b/CRM/Utils/Check/Component.php
index 37a7171cab4373bd647129b919c41741f43a02da..2f57004adeac08cab6f600a86befab37e61c55f3 100644 (file)
--- a/CRM/Utils/Check/Component.php
+++ b/CRM/Utils/Check/Component.php
@@ -28,15 +28,9 @@ abstract class CRM_Utils_Check_Component {
    */
   public function getChecksConfig() {
     if (!isset(Civi::$statics[__FUNCTION__])) {
-      // TODO: Remove this check when MINIMUM_UPGRADABLE_VERSION goes to 4.7.
-      if (CRM_Utils_System::version() !== CRM_Core_BAO_Domain::version() && !CRM_Core_DAO::checkTableExists('civicrm_status_pref')) {
-        Civi::$statics[__FUNCTION__] = [];
-      }
-      else {
-        Civi::$statics[__FUNCTION__] = (array) StatusPreference::get(FALSE)
-          ->addWhere('domain_id', '=', 'current_domain')
-          ->execute()->indexBy('name');
-      }
+      Civi::$statics[__FUNCTION__] = (array) StatusPreference::get(FALSE)
+        ->addWhere('domain_id', '=', 'current_domain')
+        ->execute()->indexBy('name');
     }
     return Civi::$statics[__FUNCTION__];
   }