Merge pull request #317 from localgovdrupal/1.x

1.7.5 release
localgovdrupal · May 7, 2024 · 7098132 · 7098132
2 parents ee2cb8f + f5a2587
commit 7098132
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/localgov_alert_banner.module b/localgov_alert_banner.module
@@ -98,7 +98,7 @@ function localgov_alert_banner_theme_suggestions_localgov_alert_banner(array $va
 function localgov_alert_banner_modules_installed($modules, $is_syncing) {
 
   // Configure scheduled transitions if it's being installed.
-  if (in_array('scheduled_transitions', $modules)) {
+  if (in_array('scheduled_transitions', $modules, TRUE)) {
     localgov_alert_banner_configure_scheduled_transitions();
   }
 }

diff --git a/modules/group_alert_banner/group_alert_banner.module b/modules/group_alert_banner/group_alert_banner.module
@@ -112,10 +112,13 @@ function group_alert_banner_query_entity_query_alter(AlterableInterface $query)
   // The 'gcfd' table alias is set in
   // Drupal\group\QueryAccess\EntityQueryAlter::doAlter() for the
   // group_relationship_field_data table.
-  $query->where(
-    "(gcfd.entity_id IS NOT NULL AND gcfd.gid = :gid) OR gcfd.entity_id IS NULL",
-    [':gid' => $gid]
-  );
+  $table_aliases = $query->getTables();
+  if (array_key_exists('gcfd', $table_aliases)) {
+    $query->where(
+      '(gcfd.entity_id IS NOT NULL AND gcfd.gid = :gid) OR gcfd.entity_id IS NULL',
+      [':gid' => $gid]
+    );
+  }
 }
 
 /**

diff --git a/tests/src/Kernel/AlertBannerBlockOrderTest.php b/tests/src/Kernel/AlertBannerBlockOrderTest.php
@@ -38,7 +38,7 @@ class AlertBannerBlockOrderTest extends KernelTestBase {
    * {@inheritdoc}
    */
   public function setUp(): void {
-    parent::setup();
+    parent::setUp();
 
     $this->installEntitySchema('content_moderation_state');
     $this->installEntitySchema('user');

diff --git a/tests/src/Kernel/SchedulingInstallTest.php b/tests/src/Kernel/SchedulingInstallTest.php
@@ -35,7 +35,7 @@ class SchedulingInstallTest extends KernelTestBase {
    * {@inheritdoc}
    */
   public function setUp(): void {
-    parent::setup();
+    parent::setUp();
 
     $this->installEntitySchema('workflow');
     $this->installEntitySchema('user');

diff --git a/tests/src/Kernel/SchedulingTest.php b/tests/src/Kernel/SchedulingTest.php
@@ -44,7 +44,7 @@ class SchedulingTest extends KernelTestBase {
    * {@inheritdoc}
    */
   public function setUp(): void {
-    parent::setup();
+    parent::setUp();
 
     $this->installEntitySchema('content_moderation_state');
     $this->installEntitySchema('user');