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 #22576 from seamuslee001/update_jquery_ui
[civicrm-core.git]
/
CRM
/
Core
/
Resources.php
diff --git
a/CRM/Core/Resources.php
b/CRM/Core/Resources.php
index 5487920d80c57de7cac2d4884461821568ea0d93..6945376e6120e76d07d63190ef7cbc3ca1b86ee1 100644
(file)
--- a/
CRM/Core/Resources.php
+++ b/
CRM/Core/Resources.php
@@
-501,11
+501,10
@@
class CRM_Core_Resources implements CRM_Core_Resources_CollectionAdderInterface
'filters' => [],
'links' => [],
];
'filters' => [],
'links' => [],
];
- $enabledComponents = Civi::settings()->get('enable_components');
foreach (CRM_Core_DAO_AllCoreTables::daoToClass() as $entity => $daoName) {
// Skip DAOs of disabled components
foreach (CRM_Core_DAO_AllCoreTables::daoToClass() as $entity => $daoName) {
// Skip DAOs of disabled components
- if (defined("$daoName::COMPONENT") && !
in_array($daoName::COMPONENT, $enabledComponents, TRUE
)) {
+ if (defined("$daoName::COMPONENT") && !
CRM_Core_Component::isEnabled($daoName::COMPONENT
)) {
continue;
}
$baoName = str_replace('_DAO_', '_BAO_', $daoName);
continue;
}
$baoName = str_replace('_DAO_', '_BAO_', $daoName);