From d359c719291163877ad59593d3b10e87a9e72161 Mon Sep 17 00:00:00 2001
From: colemanw <coleman@civicrm.org>
Date: Thu, 26 Oct 2023 13:00:03 -0400
Subject: [PATCH] dev/core#4731 - Fix column index error in SearchKit download

---
 ext/search_kit/Civi/Api4/Action/SearchDisplay/Download.php   | 2 ++
 .../phpunit/api/v4/SearchDisplay/SearchDownloadTest.php      | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/ext/search_kit/Civi/Api4/Action/SearchDisplay/Download.php b/ext/search_kit/Civi/Api4/Action/SearchDisplay/Download.php
index b0ebdbfeec..0c4fe3b2f3 100644
--- a/ext/search_kit/Civi/Api4/Action/SearchDisplay/Download.php
+++ b/ext/search_kit/Civi/Api4/Action/SearchDisplay/Download.php
@@ -65,6 +65,8 @@ class Download extends AbstractRunAction {
         \CRM_Utils_Array::remove($settings['columns'][$index], 'link', 'editable', 'icons', 'cssClass');
       }
     }
+    // Reset indexes as some items may have been removed
+    $settings['columns'] = array_values($settings['columns']);
 
     // Displays are only exportable if they have actions enabled
     if (empty($settings['actions'])) {
diff --git a/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchDownloadTest.php b/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchDownloadTest.php
index 6f15b6a4b8..9a1d211b7e 100644
--- a/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchDownloadTest.php
+++ b/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchDownloadTest.php
@@ -62,6 +62,11 @@ class SearchDownloadTest extends \PHPUnit\Framework\TestCase implements Headless
               'type' => 'field',
               'rewrite' => '[duration] [subject]',
             ],
+            // This column ought to be removed by the download action
+            [
+              'type' => 'links',
+              'links' => [],
+            ],
             [
               'key' => 'details',
               'label' => 'Details',
-- 
2.25.1