Merge pull request #27 from gheggie/master

Fixes for 3.1 compatibility
symbiote-library · Sep 8, 2017 · 3893726 · 3893726
2 parents 97bb743 + f7fbf5b
commit 3893726
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/code/ListFilterUtility.php b/code/ListFilterUtility.php
@@ -93,8 +93,9 @@ public static function filter_by_relation_ids(SS_List $list, $relationName, arra
 					$list = new ArrayList($result);
 				} else {
 					$idsSQL = "(".implode(',', $ids).")";
-
-					list($parentClass, $componentClass, $myIDColumnName, $relationIDColumnName, $manyManyTable) = singleton($class)->manyManyComponent($relationName);
+					$classObj = singleton($class);
+					$manyManyInfo = $classObj->hasMethod('manyManyComponent') ? 'manyManyComponent' : 'many_many';
+					list($parentClass, $componentClass, $myIDColumnName, $relationIDColumnName, $manyManyTable) = $classObj->$manyManyInfo($relationName);
 					$list = $list->innerJoin($manyManyTable, "\"{$myIDColumnName}\" = \"$parentClass\".\"ID\" AND \"{$relationIDColumnName}\" IN {$idsSQL}");
 				}
 			break;

diff --git a/code/form/ListFilterForm.php b/code/form/ListFilterForm.php
@@ -393,7 +393,7 @@ public function ShowingMessage(SS_List $list = null) {
 				}
 			}
 
-			$data['TotalCount'] = $list->TotalItems();
+			$data['TotalCount'] = $list->getTotalItems();
 			if ($start < $data['TotalCount']) {
 				$data['OffsetStart'] = $start + 1;
 				$data['ThisPage'] = $list->CurrentPage();