From b87f5473d9f20fe62039ef0d63320143691f7017 Mon Sep 17 00:00:00 2001
From: Stephen Shkardoon <stephen@silverstripe.com>
Date: Fri, 21 Aug 2015 00:19:08 +1200
Subject: [PATCH] MINOR Change how OldPageRedirector gets URLs to fix nested
 redirects

Previously, we would be limited by the way allParams will return 3 parameters
 at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
---
 code/controllers/OldPageRedirector.php     |  4 +-
 tests/controller/ModelAsControllerTest.php | 54 ++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/code/controllers/OldPageRedirector.php b/code/controllers/OldPageRedirector.php
index b8f6fb00..b72c130e 100644
--- a/code/controllers/OldPageRedirector.php
+++ b/code/controllers/OldPageRedirector.php
@@ -10,8 +10,8 @@ class OldPageRedirector extends Extension {
 	 * @throws SS_HTTPResponse_Exception
 	 */
 	public function onBeforeHTTPError404($request) {
-		// Build up the request parameters
-		$params = array_filter(array_values($request->allParams()), function($v) { return ($v !== NULL); });
+		// We need to get the URL ourselves because $request->allParams() only has a max of 4 params
+		$params = preg_split('|/+|', $request->getURL());
 
 		$getvars = $request->getVars();
 		unset($getvars['url']);
diff --git a/tests/controller/ModelAsControllerTest.php b/tests/controller/ModelAsControllerTest.php
index 8bdff26f..4a97fabf 100644
--- a/tests/controller/ModelAsControllerTest.php
+++ b/tests/controller/ModelAsControllerTest.php
@@ -115,6 +115,60 @@ class ModelAsControllerTest extends FunctionalTest {
 		$response = $this->get('newlevel1/newlevel2/level3');
 	}
 
+	/**
+	 * Test that the redirect works even with a lot of nested pages
+	 * Original: /oldurl/level2/level3/level4/level5
+	 * New: /newurl/level2/level3/level4/level5
+	 */
+	public function testHeavilyNestedRenamedRedirectedPages() {
+		$page = new Page();
+		$page->Title      = 'First Level';
+		$page->URLSegment = 'oldurl';
+		$page->write();
+		$page->publish('Stage', 'Live');
+		
+		$page->URLSegment = 'newurl';
+		$page->write();
+		$page->publish('Stage', 'Live');
+
+		$page2 = new Page();
+		$page2->Title      = 'Second Level Page';
+		$page2->URLSegment = 'level2';
+		$page2->ParentID = $page->ID;
+		$page2->write();
+		$page2->publish('Stage', 'Live');
+		
+		$page3 = new Page();
+		$page3->Title      = 'Third Level Page';
+		$page3->URLSegment = 'level3';
+		$page3->ParentID = $page2->ID;
+		$page3->write();
+		$page3->publish('Stage', 'Live');
+	
+		$page4 = new Page();
+		$page4->Title      = 'Fourth Level Page';
+		$page4->URLSegment = 'level4';
+		$page4->ParentID = $page3->ID;
+		$page4->write();
+		$page4->publish('Stage', 'Live');
+		
+		$page5 = new Page();
+		$page5->Title      = 'Fifth Level Page';
+		$page5->URLSegment = 'level5';
+		$page5->ParentID = $page4->ID;
+		$page5->write();
+		$page5->publish('Stage', 'Live');
+
+		// Test that the redirect still works fine when trying to access the most nested page
+		$response = $this->get('oldurl/level2/level3/level4/level5/');
+		$this->assertEquals($response->getStatusCode(), 301);
+		$this->assertEquals(
+			Controller::join_links(Director::baseURL() . 'newurl/level2/level3/level4/level5/'),
+			$response->getHeader('Location')
+		);
+	}
+
+
 	public function testRedirectionForPreNestedurlsBookmarks(){
 		$this->generateNestedPagesFixture();