From 61a0240a549c5dd1cfa53705c9988b2511b470e1 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 4 Feb 2010 04:45:53 +0000
Subject: [PATCH] BUGFIX: Fixed report pagination, with or without search
 params (from r95555)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98168 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 7e67141d..dc843090 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -205,7 +205,15 @@ class ReportAdmin extends LeftAndMain {
 		
 		$form = new Form($this, 'EditForm', $fields, $actions);
 
-		$form->loadDataFrom($_REQUEST);
+		$form->loadDataFrom($_GET);
+
+		// Include search criteria in the form action so that pagination works
+		$filteredCriteria = array_merge($_GET, $_POST);
+		foreach(array('ID','url','ajax','ctf','update','action_updatereport','SecurityID') as $notAParam) {
+			unset($filteredCriteria[$notAParam]);
+		}
+
+		$form->setFormAction($this->Link() . '/EditForm?' . http_build_query($filteredCriteria));
 		
 		return $form;
 	}