Merge pull request #247 from localgovdrupal/2.x

2.13.7 release
localgovdrupal · Sep 13, 2024 · af46ae9 · af46ae9
2 parents 9fc2c7d + af2d6c5
commit af46ae9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/modules/localgov_admin_role/localgov_admin_role.install b/modules/localgov_admin_role/localgov_admin_role.install
@@ -11,7 +11,10 @@ use Drupal\user\Entity\Role;
 /**
  * Implements hook_install().
  */
-function localgov_admin_role_install() {
+function localgov_admin_role_install($is_syncing) {
+  if ($is_syncing) {
+    return;
+  }
   // Check if the 'localgov_admin_role' role exists.
   $admin_role = Role::load(RolesHelper::ADMIN_ROLE);
   if (!$admin_role) {

diff --git a/modules/localgov_roles/localgov_roles.install b/modules/localgov_roles/localgov_roles.install
@@ -8,9 +8,15 @@
 /**
  * Implements hook_install().
  */
-function localgov_roles_install() {
+function localgov_roles_install($is_syncing) {
+
+  if ($is_syncing) {
+    return;
+  }
+
   $roles = \Drupal::service('module_handler')->invokeAll('localgov_roles_default');
   foreach ($roles as $role => $permissions) {
     user_role_grant_permissions($role, $permissions);
   }
+
 }
diff --git a/src/Service/DefaultBlockInstaller.php b/src/Service/DefaultBlockInstaller.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Extension\Extension;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Extension\ThemeHandlerInterface;
 use Drupal\Core\File\FileSystemInterface;
@@ -62,7 +63,7 @@ protected function targetThemes(): array {
     $themes = ['localgov_base', 'localgov_scarfolk'];
 
     $activeTheme = $this->getActiveThemeName();
-    if ($activeTheme && !in_array($activeTheme, $themes)) {
+    if ($activeTheme && !in_array($activeTheme, $themes, TRUE)) {
       $themes[] = $activeTheme;
     }
 
@@ -162,7 +163,7 @@ protected function sanitiseId(string $id): string {
    * Does the given theme have the given region?
    */
   protected function themeHasRegion(string $theme, string $region): bool {
-    return in_array($region, $this->themeRegions($theme));
+    return in_array($region, $this->themeRegions($theme), TRUE);
   }
 
   /**
@@ -171,7 +172,7 @@ protected function themeHasRegion(string $theme, string $region): bool {
   protected function themeRegions(string $theme): array {
     if (!isset($this->themeRegions[$theme])) {
       $themeInfo = $this->themeHandler->getTheme($theme);
-      if (empty($themeInfo)) {
+      if (!$themeInfo instanceof Extension) {
         $regions = [];
       }
       else {