From 0106e117221dee7561ad6ecfe99157d458410d55 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 19 May 2016 19:03:06 +1200
Subject: [PATCH 1/3] Removed branch alias which should only apply to latest
 release branch

See https://github.com/silverstripe/silverstripe-framework/commit/070ae2555b4b6beddec71cd2b9e54057a03e872d
for similar commit when going from 3.1 to 3.2.
---
 composer.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/composer.json b/composer.json
index 3ba23a93..e7c38dcf 100644
--- a/composer.json
+++ b/composer.json
@@ -22,11 +22,6 @@
 		"silverstripe/reports": "~3.3",
 		"silverstripe/siteconfig": "~3.3"
 	},
-	"extra": {
-		"branch-alias": {
-			"3.x-dev": "3.3.x-dev"
-		}
-	},
 	"autoload": {
 		"classmap": ["tests/behat/"]
 	},

From eba89b9520a0103e4c0cb4b6730c3c0742f8b0d9 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Tue, 31 May 2016 15:41:32 +0100
Subject: [PATCH 2/3] FIX OldPageRedirector no longer loops infinitely if 404
 thrown on existing page

---
 code/controllers/OldPageRedirector.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/controllers/OldPageRedirector.php b/code/controllers/OldPageRedirector.php
index 6756abf6..bac62316 100644
--- a/code/controllers/OldPageRedirector.php
+++ b/code/controllers/OldPageRedirector.php
@@ -12,13 +12,18 @@ class OldPageRedirector extends Extension {
 	public function onBeforeHTTPError404($request) {
 		// We need to get the URL ourselves because $request->allParams() only has a max of 4 params
 		$params = preg_split('|/+|', $request->getURL());
+		$cleanURL = trim(Director::makeRelative($request->getURL(false), '/'));
 
 		$getvars = $request->getVars();
 		unset($getvars['url']);
 
 		$page = self::find_old_page($params);
+		$cleanPage = trim(Director::makeRelative($page), '/');
+		if (!$cleanPage) {
+			$cleanPage = Director::makeRelative(RootURLController::get_homepage_link());
+		}
 
-		if ($page) {
+		if ($page && $cleanPage != $cleanURL) {
 			$res = new SS_HTTPResponse();
 			$res->redirect(
 				Controller::join_links(

From d6a57eb507fea88e12d4a97d8a700cc085623271 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dan@hens.by>
Date: Sun, 25 Jan 2015 21:07:41 +0000
Subject: [PATCH 3/3] Amending redundant test

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

diff --git a/tests/model/SiteTreeTest.php b/tests/model/SiteTreeTest.php
index b7bdd479..6f98c891 100644
--- a/tests/model/SiteTreeTest.php
+++ b/tests/model/SiteTreeTest.php
@@ -882,9 +882,9 @@ class SiteTreeTest extends SapphireTest {
 		$valid = $classB->validate();
 		$this->assertFalse($valid->valid(), "Doesnt allow child on parents disallowing all children");
 
-		$classB->ParentID = $classC->ID;
+		$classB->ParentID = $classCext->ID;
 		$valid = $classB->validate();
-		$this->assertFalse($valid->valid(), "Doesnt allow child on parents disallowing all children");
+		$this->assertTrue($valid->valid(), "Extensions of allowed classes are incorrectly reported as invalid");
 
 		$classCext->ParentID = $classD->ID;
 		$valid = $classCext->validate();