From cec0bbb894b370454d834f0ddfb51ce8b5e6fd0b Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Sun, 8 Sep 2019 01:15:40 -0400
Subject: [PATCH] reporting#19 - performance improvement on reports, especially
 CSV export

---
 CRM/Core/BAO/CustomField.php | 2 +-
 CRM/Report/Form.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index 67e70e230d..b6e4389bab 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -264,7 +264,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
     if (!$this->id) {
       return FALSE;
     }
-    $cacheKey = "CRM_Core_BAO_CustomField_getOptions_{$this->id}";
+    $cacheKey = "CRM_Core_BAO_CustomField_getOptions_{$this->id}_$context";
     $cache = CRM_Utils_Cache::singleton();
     $options = $cache->get($cacheKey);
     if (!isset($options)) {
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 77495fdcba..fbb90886db 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -2441,7 +2441,7 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
       // Run the alter display functions
       foreach ($rows as $index => & $row) {
         foreach ($row as $selectedField => $value) {
-          if (array_key_exists($selectedField, $alterFunctions)) {
+          if (array_key_exists($selectedField, $alterFunctions) && isset($value)) {
             $rows[$index][$selectedField] = $this->{$alterFunctions[$selectedField]}($value, $row, $selectedField, $alterMap[$selectedField], $alterSpecs[$selectedField]);
           }
         }
-- 
2.25.1