diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2014-02-21 15:33:13 +0100 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2014-02-21 15:33:13 +0100 |
| commit | a5c70f16d242fdf9c92b939f688344f011254ad5 (patch) | |
| tree | 887668cffc032d9c4bbe58fdd48b1d1c2024c911 /core/js | |
| parent | aa0bcf7ba45d004b0c0226fd07696f9f224f9c1c (diff) | |
| parent | d9e333c0da352eea6731f66e7c89f63edd837426 (diff) | |
| download | nextcloud-server-a5c70f16d242fdf9c92b939f688344f011254ad5.tar.gz nextcloud-server-a5c70f16d242fdf9c92b939f688344f011254ad5.zip | |
Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs
fix thumbnail generation for subdirectories in the conflicts dialog
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/oc-dialogs.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index f4e3ec01447..d1bcb4659b8 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -293,7 +293,7 @@ var OCdialogs = { conflict.find('.replacement .size').text(humanFileSize(replacement.size)); conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate)); } - var path = getPathForPreview(original.name); + var path = original.directory + '/' +original.name; Files.lazyLoadPreview(path, original.mime, function(previewpath){ conflict.find('.original .icon').css('background-image','url('+previewpath+')'); }, 96, 96, original.etag); |