diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php index 2701498a36c4..4da20b267994 100755 --- a/src/Illuminate/Database/Eloquent/Builder.php +++ b/src/Illuminate/Database/Eloquent/Builder.php @@ -489,11 +489,12 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page', * @param int $perPage * @param array $columns * @param string $pageName + * @param int|null $page * @return \Illuminate\Contracts\Pagination\Paginator */ - public function simplePaginate($perPage = null, $columns = ['*'], $pageName = 'page') + public function simplePaginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null) { - $page = Paginator::resolveCurrentPage($pageName); + $page = $page ?: Paginator::resolveCurrentPage($pageName); $perPage = $perPage ?: $this->model->getPerPage(); diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php index dc0df081dbdf..9ede668fbf40 100755 --- a/src/Illuminate/Database/Query/Builder.php +++ b/src/Illuminate/Database/Query/Builder.php @@ -1546,11 +1546,12 @@ public function paginate($perPage = 15, $columns = ['*'], $pageName = 'page', $p * @param int $perPage * @param array $columns * @param string $pageName + * @param int|null $page * @return \Illuminate\Contracts\Pagination\Paginator */ - public function simplePaginate($perPage = 15, $columns = ['*'], $pageName = 'page') + public function simplePaginate($perPage = 15, $columns = ['*'], $pageName = 'page', $page = null) { - $page = Paginator::resolveCurrentPage($pageName); + $page = $page ?: Paginator::resolveCurrentPage($pageName); $this->skip(($page - 1) * $perPage)->take($perPage + 1);