Merge pull request #24 from eileenmcnaughton/dev_core_1450

dev/core#1450 Allow sites to opt out of using temporary tables when b…

multisite.php

@@ -287,6 +287,10 @@ function multisite_civicrm_aclWhereClause($type, &$tables, &$whereTables, &$cont
     return;
   }
   $childOrganizations = _multisite_get_all_child_groups($groupID);
+  // We have view all contacts in domain or edit all contacts in domain so lets not use a temporary table.
+  if ((CRM_Core_Permission::check('view all contacts in domain') || CRM_Core_Permission::check('edit all contacts in domain')) && Civi::Settings()->get('multisite_not_use_temp_table')) {
+    CRM_Contact_BAO_Contact_Permission::setUseTemporaryTable(FALSE);
+  }
   if (!empty($childOrganizations)) {
     $groupTable = 'civicrm_group_contact';
     $groupTableAlias = 'multisiteGroupTable';

settings/Multisite.setting.php

@@ -72,5 +72,17 @@
     'is_contact' => 0,
     'description' => 'Array of tabs which should be visible on this site',
     'help_text' => 'Enabled Custom Tabs',
-  ),
- );
+   ),
+   'multisite_not_use_temp_table' => [
+    'group_name' => 'Multi Site Preferences',
+    'group' => 'multisite',
+    'name' => 'multisite_not_use_temp_table',
+    'type' => 'Boolean',
+    'default' => 0,
+    'add' => '5.20',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'Should we disable the use of temporary tables when building ACL permissions for roles with view all contacts in domain or edit all contacts in domain',
+    'html' => 'Checkbox',
+  ],
+);