- $previous_page_url = '';
- if ($i !== count($keys)) {
- $previous_page_url = '?page=' . ($page + 1) . $searchtermUrl . $searchtagsUrl;
- }
- $next_page_url = '';
- if ($page > 1) {
- $next_page_url = '?page=' . ($page - 1) . $searchtermUrl . $searchtagsUrl;
- }
+ $previousPageUrl = !$searchResult->isLastPage() ? '?page=' . ($page + 1) . $searchtermUrl . $searchtagsUrl : '';
+ $nextPageUrl = !$searchResult->isFirstPage() ? '?page=' . ($page - 1) . $searchtermUrl . $searchtagsUrl : '';
+
+ $tagsSeparator = $this->container->conf->get('general.tags_separator', ' ');
+ $searchTagsUrlEncoded = array_map('urlencode', tags_str2array($searchTags, $tagsSeparator));
+ $searchTags = !empty($searchTags) ? trim($searchTags, $tagsSeparator) . $tagsSeparator : '';