Fix issue with no group by sql_mode

diff --git a/CRM/Contact/BAO/GroupContactCache.php b/CRM/Contact/BAO/GroupContactCache.php
index b63e2c49d07cd39ecdb98d2fcfa23a55444cd1b7..defc7400393332ba3f4e087ce647c64d14c3f339 100644 (file)
--- a/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@ -483,6 +483,8 @@ WHERE  id IN ( $groupIDs )
       CRM_Core_DAO::executeQuery("INSERT IGNORE INTO $tempTable (group_id, contact_id) {$contactQuery}");
     }
 
+    CRM_Core_DAO::reenableFullGroupByMode();
+
     if ($group->children) {
 
       // Store a list of contacts who are removed from the parent group

diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 9fd3369ab68aa2728e0081fa05b18aa3d723f28f..1792a1c229616f0205d68de52a8b5bb500793a58 100644 (file)
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -3800,6 +3800,7 @@ WHERE a1.is_primary = 0
     $currentModes = array_fill_keys(CRM_Utils_SQL::getSqlModes(), 1);
     $currentModes = array_merge($currentModes, array_fill_keys($modes, 1));
     CRM_Core_DAO::executeQuery("SET GLOBAL sql_mode = '" . implode(',', array_keys($currentModes)) . "'");
+    CRM_Core_DAO::executeQuery("SET sql_mode = '" . implode(',', array_keys($currentModes)) . "'");
   }
 
 }