From 6e567852b77666c66e7c25b92e189f00b52b5b6c Mon Sep 17 00:00:00 2001
From: torleif <torleifw@gmail.com>
Date: Fri, 9 Dec 2016 09:15:44 +1300
Subject: [PATCH 1/2] Fixes #529

---
 code/model/UserDefinedForm.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/model/UserDefinedForm.php b/code/model/UserDefinedForm.php
index 24c6336..9c5f15c 100755
--- a/code/model/UserDefinedForm.php
+++ b/code/model/UserDefinedForm.php
@@ -178,10 +178,10 @@ class UserDefinedForm extends Page
 
             // get a list of all field names and values used for print and export CSV views of the GridField below.
             $columnSQL = <<<SQL
-SELECT "SubmittedFormField"."Name" as "Name", "SubmittedFormField"."Title" as "Title", COALESCE("EditableFormField"."Sort", 999) AS "Sort"
+SELECT "SubmittedFormField"."Name" as "Name", "EditableFormField"."Title" as "Title", COALESCE("EditableFormField"."Sort", 999) AS "Sort"
 FROM "SubmittedFormField"
 LEFT JOIN "SubmittedForm" ON "SubmittedForm"."ID" = "SubmittedFormField"."ParentID"
-LEFT JOIN "EditableFormField" ON "EditableFormField"."Title" = "SubmittedFormField"."Title" AND "EditableFormField"."ParentID" = '$parentID'
+LEFT JOIN "EditableFormField" ON "EditableFormField"."Name" = "SubmittedFormField"."Name" AND "EditableFormField"."ParentID" = '$parentID'
 WHERE "SubmittedForm"."ParentID" = '$parentID'
 ORDER BY "Sort", "Title"
 SQL;

From a6229ab22b2e045fcacf3a9def6c6773c66681bc Mon Sep 17 00:00:00 2001
From: torleif <torleifw@gmail.com>
Date: Fri, 9 Dec 2016 12:01:10 +1300
Subject: [PATCH 2/2] Fixes #529

---
 code/model/UserDefinedForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/model/UserDefinedForm.php b/code/model/UserDefinedForm.php
index 9c5f15c..2a1cd51 100755
--- a/code/model/UserDefinedForm.php
+++ b/code/model/UserDefinedForm.php
@@ -178,7 +178,7 @@ class UserDefinedForm extends Page
 
             // get a list of all field names and values used for print and export CSV views of the GridField below.
             $columnSQL = <<<SQL
-SELECT "SubmittedFormField"."Name" as "Name", "EditableFormField"."Title" as "Title", COALESCE("EditableFormField"."Sort", 999) AS "Sort"
+SELECT "SubmittedFormField"."Name" as "Name", COALESCE("EditableFormField"."Title", "SubmittedFormField"."Title") as "Title", COALESCE("EditableFormField"."Sort", 999) AS "Sort"
 FROM "SubmittedFormField"
 LEFT JOIN "SubmittedForm" ON "SubmittedForm"."ID" = "SubmittedFormField"."ParentID"
 LEFT JOIN "EditableFormField" ON "EditableFormField"."Name" = "SubmittedFormField"."Name" AND "EditableFormField"."ParentID" = '$parentID'