Merge pull request #5699 from kenjis/fix-BaseModel-paginate

kenjis · web-flow · commit d0cf9c8d0bfc · 2022-02-22T18:06:10.000+09:00
fix: Model::paginate() missing argument $group
diff --git a/system/BaseModel.php b/system/BaseModel.php
@@ -1076,7 +1076,7 @@ public function paginate(?int $perPage = null, string $group = 'default', ?int $
         $pager = Services::pager(null, null, false);
 
         if ($segment) {
-            $pager->setSegment($segment);
+            $pager->setSegment($segment, $group);
         }
 
         $page = $page >= 1 ? $page : $pager->getCurrentPage($group);

Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,7 @@ public function paginate(?int $perPage = null, string $group = 'default', ?int $`
`1076`	`1076`	`$pager = Services::pager(null, null, false);`
`1077`	`1077`
`1078`	`1078`	`if ($segment) {`
`1079`		`- $pager->setSegment($segment);`
	`1079`	`+ $pager->setSegment($segment, $group);`
`1080`	`1080`	`}`
`1081`	`1081`
`1082`	`1082`	`$page = $page >= 1 ? $page : $pager->getCurrentPage($group);`