Bug fixes (#28)

Fix 3.1 compatibility issues with PaginatedList and $Title
symbiote-library · Sep 14, 2017 · fd19c04 · fd19c04
1 parent 3893726
commit fd19c04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/form/ListFilterCompositeField.php b/code/form/ListFilterCompositeField.php
@@ -77,7 +77,7 @@ public function __construct(ListFilterBase $filter) {
 	 * @return string
 	 */
 	public function getLegend() {
-		return $this->getTitle();
+		return $this->Title();
 	}
 
 	/**

diff --git a/code/form/ListFilterForm.php b/code/form/ListFilterForm.php
@@ -385,7 +385,7 @@ public function ShowingMessage(SS_List $list = null) {
 		$data = array();
 		if ($list instanceof PaginatedList) {
 			$start = 0;
-			$request = $list->getRequest();
+			$request = $list->hasMethod('getRequest') ? $list->getRequest() : $this->controller->getRequest();
 			if ($request) {
 				$getVarName = $list->getPaginationGetVar();
 				if($request && isset($request[$getVarName]) && $request[$getVarName] > 0) {