Backport of #121

UndefinedOffset · Jun 7, 2018 · 5c2ed5e · 5c2ed5e
1 parent d616a78
commit 5c2ed5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## [1.0.2](https://github.com/UndefinedOffset/SortableGridField/tree/1.0.2) (2018-06-07)
+[Full Changelog](https://github.com/UndefinedOffset/SortableGridField/compare/1.0.1...1.0.2)
+
 ## [1.0.1](https://github.com/UndefinedOffset/SortableGridField/tree/1.0.1) (2018-03-01)
 [Full Changelog](https://github.com/UndefinedOffset/SortableGridField/compare/1.0.0...1.0.1)
 

diff --git a/code/forms/GridFieldSortableRows.php b/code/forms/GridFieldSortableRows.php
@@ -598,7 +598,7 @@ protected function sortToPage(GridField $gridField, $data) {
 
 			$i = 1;
 			foreach ($items as $obj) {
-				if ($obj->ID == $targetItem->ID) {
+				if ($obj->ID == $targetItem->ID || $i >= count($sortPositions)) {
 					continue;
 				}