diff --git a/Changelog b/Changelog index 9a849ae0c..2ba0d5306 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-05-24 DariusIII + * Fix: Fix advanced search * Chg: Do not send google recaptcha response inside contact email message * Fix: Fix errors on no returned results in tvSearch 2018-05-23 DariusIII diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index a132e44aa..5e0172523 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -129,7 +129,7 @@ class SearchController extends BasePageController ); } - $results = $releases->search( + $rslt = $releases->search( ($searchVars['searchadvr'] === '' ? -1 : $searchVars['searchadvr']), ($searchVars['searchadvsubject'] === '' ? -1 : $searchVars['searchadvsubject']), ($searchVars['searchadvposter'] === '' ? -1 : $searchVars['searchadvposter']), @@ -141,6 +141,8 @@ class SearchController extends BasePageController $searchVars['searchadvhascomments'], ($searchVars['searchadvdaysnew'] === '' ? -1 : $searchVars['searchadvdaysnew']), ($searchVars['searchadvdaysold'] === '' ? -1 : $searchVars['searchadvdaysold']), + $offset, + config('nntmux.items_per_page'), $orderBy, -1, $this->userdata['categoryexclusions'], @@ -148,6 +150,8 @@ class SearchController extends BasePageController [$searchVars['searchadvcat'] === '' ? -1 : $searchVars['searchadvcat']] ); + $results = $this->paginate($rslt ?? [], $rslt[0]->_totalrows ?? 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query()); + $this->smarty->assign( [ 'lastvisit' => $this->userdata['lastlogin'],