]> source.dussan.org Git - nextcloud-server.git/commitdiff
Use absolute URLs on search results for the clients 22854/head
authorJoas Schilling <coding@schilljs.com>
Tue, 15 Sep 2020 07:20:10 +0000 (09:20 +0200)
committerJoas Schilling <coding@schilljs.com>
Tue, 15 Sep 2020 07:20:10 +0000 (09:20 +0200)
Signed-off-by: Joas Schilling <coding@schilljs.com>
apps/comments/lib/Search/CommentsSearchProvider.php
apps/files/lib/Search/FilesSearchProvider.php

index cae4c2f23511c36b9d08f9b810cd7d06dc240dba..67c297b02ceef8b3a087b05d9879ed8885f3135f 100644 (file)
@@ -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'],
                                        ]),
index 79ea4aa89f790105fcc247291ae633f20971e74e..e0f421d401d900ec484487e002f575898398ceb4 100644 (file)
@@ -97,14 +97,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()))