Merge branch 'hotfix/5.9.4' of https://github.com/espocrm/espocrm into hotfix/5.9.4

2020-08-25 18:04:36 +03:00
parent 1662cfd97d 0fd8f9d29f
commit f60c5e29de
1 changed files with 6 additions and 1 deletions
@@ -75,7 +75,7 @@ class Email extends \Espo\Core\SelectManagers\Base
                $skipIndex = true;
            }

-            $actualDatabaseType = $this->getConfig()->get('actualDatabaseType');
+            /*$actualDatabaseType = strtolower($this->getConfig()->get('actualDatabaseType'));
            $actualDatabaseVersion = $this->getConfig()->get('actualDatabaseVersion');

            if (
@@ -84,7 +84,12 @@ class Email extends \Espo\Core\SelectManagers\Base
                $this->hasLinkJoined('teams', $result)
            ) {
                $skipIndex = true;
+            }*/
+
+            if ($this->hasLinkJoined('teams', $result)) {
+                $skipIndex = true;
            }
+
            if (!$skipIndex) {
                $result['useIndex'] = 'dateSent';
            }