Merge pull request #12106 from eileenmcnaughton/activity

[civicrm-core.git] / CRM / Core / DAO.php

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 294c1e4f7215e1e6cf60a4c8e84c67b2052c2ada..6df94eb19ad1694f07d99ca3eae790d7a825cb44 100644 (file)
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -169,7 +169,7 @@ class CRM_Core_DAO extends DB_DataObject {
    */
   public static function disableFullGroupByMode() {
     $currentModes = CRM_Utils_SQL::getSqlModes();
-    if (CRM_Utils_SQL::supportsFullGroupBy() && in_array('ONLY_FULL_GROUP_BY', $currentModes) && CRM_Utils_SQL::isGroupByModeInDefault()) {
+    if (in_array('ONLY_FULL_GROUP_BY', $currentModes) && CRM_Utils_SQL::isGroupByModeInDefault()) {
       $key = array_search('ONLY_FULL_GROUP_BY', $currentModes);
       unset($currentModes[$key]);
       CRM_Core_DAO::executeQuery("SET SESSION sql_mode = %1", array(1 => array(implode(',', $currentModes), 'String')));
@@ -177,11 +177,11 @@ class CRM_Core_DAO extends DB_DataObject {
   }
 
   /**
-   * Enables ONLY_FULL_GROUP_BY sql_mode as necessary..
+   * Re-enables ONLY_FULL_GROUP_BY sql_mode as necessary..
    */
-  public static function enableFullGroupByMode() {
+  public static function reenableFullGroupByMode() {
     $currentModes = CRM_Utils_SQL::getSqlModes();
-    if (CRM_Utils_SQL::supportsFullGroupBy() && !in_array('ONLY_FULL_GROUP_BY', $currentModes) && CRM_Utils_SQL::isGroupByModeInDefault()) {
+    if (!in_array('ONLY_FULL_GROUP_BY', $currentModes) && CRM_Utils_SQL::isGroupByModeInDefault()) {
       $currentModes[] = 'ONLY_FULL_GROUP_BY';
       CRM_Core_DAO::executeQuery("SET SESSION sql_mode = %1", array(1 => array(implode(',', $currentModes), 'String')));
     }
@@ -1686,6 +1686,7 @@ FROM   civicrm_domain
    * @param $componentIDs
    * @param string $tableName
    * @param string $idField
+   *
    * @return array
    */
   public static function getContactIDsFromComponent($componentIDs, $tableName, $idField = 'id') {