[GF] Fix resolveCurrentPage()

Giacomo Fabbian · Giacomo Fabbian · commit 70c72634b098 · 2020-02-12T09:58:38.000+01:00
diff --git a/src/Jenssegers/Mongodb/Relations/EmbedsMany.php b/src/Jenssegers/Mongodb/Relations/EmbedsMany.php
@@ -273,7 +273,7 @@ protected function associateExisting($model)
      */
     public function paginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null)
     {
-        $page = Paginator::resolveCurrentPage();
+        $page = $page ?: Paginator::resolveCurrentPage($pageName);
         $perPage = $perPage ?: $this->related->getPerPage();
 
         $results = $this->getEmbedded();

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ protected function associateExisting($model)`
`273`	`273`	`*/`
`274`	`274`	`public function paginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null)`
`275`	`275`	`{`
`276`		`- $page = Paginator::resolveCurrentPage();`
	`276`	`+ $page = $page ?: Paginator::resolveCurrentPage($pageName);`
`277`	`277`	`$perPage = $perPage ?: $this->related->getPerPage();`
`278`	`278`
`279`	`279`	`$results = $this->getEmbedded();`