Merge pull request #17476 from civicrm/5.26

5.26

CRM/Export/Form/Map.php

@@ -146,6 +146,14 @@ class CRM_Export_Form_Map extends CRM_Core_Form {
       $exportParams['postal_mailing_export']['postal_mailing_export'] == 1
     );
     $processor = new CRM_Export_BAO_ExportProcessor($this->get('exportMode'), NULL, $this->get('queryOperator'), $this->get('mergeSameHousehold'), $isPostalOnly, $this->get('mergeSameAddress'));
+    // dev/core#1775 Remove notes,groups and tags from the preview data to speed up export
+    $defaultProperties = $processor->getDefaultReturnProperties();
+    foreach ($defaultProperties as $key => $var) {
+      if (in_array($key, ['groups', 'tags', 'notes'])) {
+        unset($defaultProperties[$key]);
+      }
+    }
+    $processor->setReturnProperties($defaultProperties);
     $processor->setComponentTable($this->get('componentTable'));
     $processor->setComponentClause($this->get('componentClause'));
     $data = $processor->getPreview(4);

contributor-key.yml

@@ -75,6 +75,9 @@
   organization: AGH Strategies
   jira        : alifrumin
 
+- github      : andyburnsco
+  name        : Andy Burns
+
 - github      : amsharma9
   name        : Amal Sharma
   organization: Abhikalak Consultants
@@ -574,6 +577,10 @@
   organization: CompuCorp
   jira        : guanhuan
 
+- github      : GuillaumeSorel
+  name        : Guillaume Sorel
+  organization: All In Appli.com
+
 - github      : guyiac
   name        : Guy Iaccarino
   organization: Greenleaf Advancement
@@ -650,6 +657,10 @@
   name        : Matthijs Keijser
   organization: CiviCoop
 
+- github      : ivan-compucorp
+  name        : Ivan
+  organization: CompuCorp
+
 - github      : jaapjansma
   name        : Jaap Jansma
   organization: CiviCoop