From 71a8cac9e5b3ca99fa3fa51ee42c045f6c5bedb5 Mon Sep 17 00:00:00 2001
From: Maxime Rainville <maxime@silverstripe.com>
Date: Mon, 9 Mar 2020 15:35:58 +1300
Subject: [PATCH 1/2] BUG Remove bad default value for UserForm Content (#926)

* BUG Remove bad default value for UserForm Content

* BUG Update travis build to use Xenial
---
 .travis.yml       | 5 +++++
 code/UserForm.php | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 83ec4c6..5d3af09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,10 @@
 language: php
 
+dist: xenial
+
+services:
+  - mysql
+
 env:
   global:
     - COMPOSER_ROOT_VERSION=5.0.x-dev
diff --git a/code/UserForm.php b/code/UserForm.php
index 89bcf0d..0b1fc6d 100644
--- a/code/UserForm.php
+++ b/code/UserForm.php
@@ -107,7 +107,6 @@ trait UserForm
      * @var array Default values of variables when this page is created
      */
     private static $defaults = [
-        'Content' => '$UserDefinedForm',
         'DisableSaveSubmissions' => 0,
         'OnCompleteMessage' => '<p>Thanks, we\'ve received your submission.</p>'
     ];

From 1c73fd90cabfce2281a6565941ebaf02c9e6aa4f Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Mon, 16 Mar 2020 16:36:36 +1300
Subject: [PATCH 2/2] Revert default value

---
 code/UserForm.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/UserForm.php b/code/UserForm.php
index 0b1fc6d..89bcf0d 100644
--- a/code/UserForm.php
+++ b/code/UserForm.php
@@ -107,6 +107,7 @@ trait UserForm
      * @var array Default values of variables when this page is created
      */
     private static $defaults = [
+        'Content' => '$UserDefinedForm',
         'DisableSaveSubmissions' => 0,
         'OnCompleteMessage' => '<p>Thanks, we\'ve received your submission.</p>'
     ];