Merge pull request #19725 from totten/5.35-avail-perm

dev/drupal#156 - system_get_info() is gone in Drupal 9
civicrm · Mar 4, 2021 · 946090a · 946090a
2 parents 288dde5 + 76fffb7
commit 946090a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CRM/Core/Permission/Drupal8.php b/CRM/Core/Permission/Drupal8.php
@@ -58,7 +58,7 @@ public function getAvailablePermissions() {
     $allCorePerms = \CRM_Core_Permission::basicPermissions(TRUE);
 
     $dperms = \Drupal::service('user.permissions')->getPermissions();
-    $modules = system_get_info('module');
+    $modules = \Drupal::service('extension.list.module')->getAllInstalledInfo();
 
     $permissions = [];
     foreach ($dperms as $permName => $dperm) {

diff --git a/release-notes/5.35.0.md b/release-notes/5.35.0.md
@@ -460,7 +460,10 @@ Released March 3, 2021
   ([dev/drupal#65](https://lab.civicrm.org/dev/drupal/-/issues/65):
   [580](https://github.com/civicrm/civicrm-drupal/pull/580))**
 
-- **fix deceased date format
+- **Drupal9: system_get_info() not available. CiviReport crash.**
+  ([dev/drupal#156](https://lab.civicrm.org/dev/drupal/-/issues/156): [#19725](https://github.com/civicrm/civicrm-core/pull/19725))
+
+- **Fix deceased date format
   ([607](https://github.com/civicrm/civicrm-drupal/pull/607))**
 
 ### WordPress Integration