From 1d77f6b36e8d823ace4a745405e89e4d993b3a76 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Mon, 26 Feb 2018 14:33:58 +0000
Subject: [PATCH 1/3] Backport of 68d374

---
 code/model/MultiFormStep.php                | 8 +++++++-
 templates/Includes/MultiFormProgressList.ss | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/model/MultiFormStep.php b/code/model/MultiFormStep.php
index 49ebe6d..b9c910f 100644
--- a/code/model/MultiFormStep.php
+++ b/code/model/MultiFormStep.php
@@ -141,7 +141,13 @@ class MultiFormStep extends DataObject {
 	 */
 	public function Link() {
 		$form = $this->form;
-		return Controller::join_links($form->getDisplayLink(), "?{$form->config()->get_var}={$this->Session()->Hash}");
+		return Controller::join_links(
+			$form->getDisplayLink(),
+			'?' . http_build_query(array(
+				$form->getGetVar() => $this->Session()->Hash,
+				'StepID' => $this->ID,
+			))
+		);
 	}
 
 	/**
diff --git a/templates/Includes/MultiFormProgressList.ss b/templates/Includes/MultiFormProgressList.ss
index 59a420d..441cca5 100644
--- a/templates/Includes/MultiFormProgressList.ss
+++ b/templates/Includes/MultiFormProgressList.ss
@@ -1,7 +1,7 @@
 <ul class="stepIndicator current-$CurrentStep.class">
 <% loop AllStepsLinear %>
 	<li class="$ClassName<% if LinkingMode %> $LinkingMode<% end_if %><% if FirstLast %> $FirstLast<% end_if %><% if $ExtraClasses %> $ExtraClasses<% end_if %>">
-		<% if LinkingMode = current %><% else %><% if ID %><a href="{$Top.URLSegment}/?${Top.GetVar}={$SessionID}&amp;StepID={$ID}"><% end_if %><% end_if %>
+		<% if LinkingMode = current %><% else %><% if ID %><a href="$Link"><% end_if %><% end_if %>
 		<% if Title %>$Title<% else %>$ClassName<% end_if %>
 		<% if LinkingMode = current %><% else %><% if ID %></a><% end_if %><% end_if %>
 	</li>

From 3443417894bd3f022158ec250c977c92f425d0b9 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Mon, 26 Feb 2018 16:10:17 +0000
Subject: [PATCH 2/3] Get 5.3 tests running

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 44a7095..0aeb576 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@
 
 sudo: false
 
+dist: precise
+
 language: php
 
 php:
@@ -12,14 +14,14 @@ php:
   - 7.0
 
 env:
-  - DB=MYSQL CORE_RELEASE=3.2
+  - DB=MYSQL CORE_RELEASE=3.6
 
 matrix:
   include:
     - php: 5.6
       env: DB=MYSQL CORE_RELEASE=3
     - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.2
+      env: DB=PGSQL CORE_RELEASE=3.5
   allow_failures:
     - php: 7.0
 

From 642e52b4e651cc2ab93b2f79a346ab89e584e805 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Mon, 26 Feb 2018 16:23:18 +0000
Subject: [PATCH 3/3] Try to get existing tests passing

---
 code/extensions/MultiFormObjectDecorator.php | 2 +-
 tests/MultiFormObjectDecoratorTest.php       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/extensions/MultiFormObjectDecorator.php b/code/extensions/MultiFormObjectDecorator.php
index 3168538..28bad9e 100644
--- a/code/extensions/MultiFormObjectDecorator.php
+++ b/code/extensions/MultiFormObjectDecorator.php
@@ -59,7 +59,7 @@ class MultiFormObjectDecorator extends DataExtension {
 		foreach($query->getWhere() as $whereClause) {
 			$from = array_values($query->getFrom());
 			// SQLQuery will automatically add double quotes and single quotes to values, so check against that.
-			if($whereClause == "{$from[0]}.\"MultiFormIsTemporary\" = '1'") {
+			if($whereClause == "{$from[0]}.\"MultiFormIsTemporary\" = '1'" || $whereClause == "{$from[0]}.\"MultiFormIsTemporary\" = 1") {
 				return true;
 			}
 		}
diff --git a/tests/MultiFormObjectDecoratorTest.php b/tests/MultiFormObjectDecoratorTest.php
index f935f93..6d4584e 100644
--- a/tests/MultiFormObjectDecoratorTest.php
+++ b/tests/MultiFormObjectDecoratorTest.php
@@ -8,7 +8,7 @@ class MultiFormObjectDecoratorTest extends SapphireTest {
 	);
 
 	protected $extraDataObjects = array(
-		'MultiFormObjectDecorator_DataObject'
+		'MultiFormObjectDecorator_DataObject',
 	);
 
 	public function testTemporaryDataFilteredQuery() {
@@ -16,6 +16,7 @@ class MultiFormObjectDecoratorTest extends SapphireTest {
 			->map('Name')
 			->toArray();
 
+		$this->assertCount(2, $records);
 		$this->assertContains('Test 1', $records);
 		$this->assertContains('Test 2', $records);
 		$this->assertNotContains('Test 3', $records);
@@ -28,6 +29,7 @@ class MultiFormObjectDecoratorTest extends SapphireTest {
 			->map('Name')
 			->toArray();
 
+		$this->assertCount(1, $records);
 		$this->assertNotContains('Test 1', $records);
 		$this->assertNotContains('Test 2', $records);
 		$this->assertContains('Test 3', $records);
@@ -35,7 +37,7 @@ class MultiFormObjectDecoratorTest extends SapphireTest {
 
 }
 
-class MultiFormObjectDecorator_DataObject extends DataObject {
+class MultiFormObjectDecorator_DataObject extends DataObject implements TestOnly {
 
 	private static $db = array(
 		'Name' => 'Varchar'