From 30725916dbb0ffc66b77f26c069a86581636ae55 Mon Sep 17 00:00:00 2001
From: Juan van den Anker <juan@vdanker.net>
Date: Thu, 16 Feb 2017 11:20:00 +1300
Subject: [PATCH] FIX Array to string conversion message after CSV export
 (#6622)

* FIX Array to string conversion message after CSV export

* Removed invalid line endings
---
 forms/gridfield/GridFieldExportButton.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/forms/gridfield/GridFieldExportButton.php b/forms/gridfield/GridFieldExportButton.php
index 307399e20..b67f63b33 100644
--- a/forms/gridfield/GridFieldExportButton.php
+++ b/forms/gridfield/GridFieldExportButton.php
@@ -110,8 +110,13 @@ class GridFieldExportButton implements GridField_HTMLProvider, GridField_ActionP
 
 			// determine the CSV headers. If a field is callable (e.g. anonymous function) then use the
 			// source name as the header instead
+
 			foreach($csvColumns as $columnSource => $columnHeader) {
-				$headers[] = (!is_string($columnHeader) && is_callable($columnHeader)) ? $columnSource : $columnHeader;
+				if (is_array($columnHeader) && array_key_exists('title', $columnHeader)) {
+					$headers[] = $columnHeader['title'];
+				} else {
+					$headers[] = (!is_string($columnHeader) && is_callable($columnHeader)) ? $columnSource : $columnHeader;
+				}
 			}
 
 			$fileData .= "\"" . implode("\"{$separator}\"", array_values($headers)) . "\"";