Skip to content

Commit

Permalink
Merge pull request #1646 from nextcloud/backport/1645/stable25
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelklehr authored Feb 23, 2023
2 parents 3b2c6c1 + 1944990 commit 12241e2
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions js/photos-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-main.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-public.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/mixins/FetchFacesMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export default {

fetchedFiles = fetchedFiles
.map(file => genFileInfo(file))
.map(file => ({ ...file, filename: file.realpath.replace(`/${getCurrentUser().uid}/files`, `/files/${getCurrentUser().uid}`) }))
.map(file => ({ ...file, filename: he.decode(file.realpath).replace(`/${getCurrentUser().uid}/files`, `/files/${getCurrentUser().uid}`) }))
.map(file => ({ ...file, faceDetections: JSON.parse(he.decode(file.faceDetections)) }))

const fileIds = fetchedFiles.map(file => '' + file.fileid)
Expand Down

0 comments on commit 12241e2

Please sign in to comment.