diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-09-15 11:35:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-15 11:35:28 +0200 |
| commit | 2dbeb58c7ac16e3b7c44cb1783cd1b0a5f0f616d (patch) | |
| tree | bd9265efd9de9f12fe0bca78eb6d709f71099e2e | |
| parent | 74e0b501998ee28915d4f5cbda22189e8afd55d3 (diff) | |
| parent | d37bd2cbabbe780fdf6f0ecf113336732f7de16c (diff) | |
| download | nextcloud-server-2dbeb58c7ac16e3b7c44cb1783cd1b0a5f0f616d.tar.gz nextcloud-server-2dbeb58c7ac16e3b7c44cb1783cd1b0a5f0f616d.zip | |
Merge pull request #22854 from nextcloud/bugfix/noid/unified-search
Bugfix/noid/unified search
| -rw-r--r-- | apps/comments/lib/Search/CommentsSearchProvider.php | 6 | ||||
| -rw-r--r-- | apps/files/lib/Search/FilesSearchProvider.php | 4 | ||||
| -rw-r--r-- | core/Controller/UnifiedSearchController.php | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/apps/comments/lib/Search/CommentsSearchProvider.php b/apps/comments/lib/Search/CommentsSearchProvider.php index cae4c2f2351..67c297b02ce 100644 --- a/apps/comments/lib/Search/CommentsSearchProvider.php +++ b/apps/comments/lib/Search/CommentsSearchProvider.php @@ -99,13 +99,13 @@ class CommentsSearchProvider implements IProvider { $pathInfo = pathinfo($path); $isUser = $this->userManager->userExists($result->authorId); $avatarUrl = $isUser - ? $this->urlGenerator->linkToRoute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42]) - : $this->urlGenerator->linkToRoute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]); + ? $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42]) + : $this->urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]); return new SearchResultEntry( $avatarUrl, $result->name, $path, - $this->urlGenerator->linkToRoute('files.view.index',[ + $this->urlGenerator->linkToRouteAbsolute('files.view.index',[ 'dir' => $pathInfo['dirname'], 'scrollto' => $pathInfo['basename'], ]), diff --git a/apps/files/lib/Search/FilesSearchProvider.php b/apps/files/lib/Search/FilesSearchProvider.php index d36153706bf..5c97e771ab7 100644 --- a/apps/files/lib/Search/FilesSearchProvider.php +++ b/apps/files/lib/Search/FilesSearchProvider.php @@ -107,14 +107,14 @@ class FilesSearchProvider implements IProvider { array_map(function (FileResult $result) { // Generate thumbnail url $thumbnailUrl = $result->has_preview - ? $this->urlGenerator->linkToRoute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id]) + ? $this->urlGenerator->linkToRouteAbsolute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id]) : ''; return new SearchResultEntry( $thumbnailUrl, $result->name, $this->formatSubline($result), - $result->link, + $this->urlGenerator->getAbsoluteURL($result->link), $result->type === 'folder' ? 'icon-folder' : $this->mimeTypeDetector->mimeTypeIcon($result->mime_type) ); }, $this->fileSearch->search($query->getTerm())) diff --git a/core/Controller/UnifiedSearchController.php b/core/Controller/UnifiedSearchController.php index e4593ff4174..c2949ce6095 100644 --- a/core/Controller/UnifiedSearchController.php +++ b/core/Controller/UnifiedSearchController.php @@ -72,9 +72,10 @@ class UnifiedSearchController extends OCSController { public function getProviders(string $from = ''): DataResponse { [$route, $parameters] = $this->getRouteInformation($from); - return new DataResponse( - $this->composer->getProviders($route, $parameters) - ); + $result = $this->composer->getProviders($route, $parameters); + $response = new DataResponse($result); + $response->setETag(md5(json_encode($result))); + return $response; } /** |