diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-02-21 11:18:23 +0100 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2014-02-21 14:01:38 +0100 |
| commit | d9e333c0da352eea6731f66e7c89f63edd837426 (patch) | |
| tree | 34e3f121b13e899314cd397ef42f9458a1ca52da /core | |
| parent | 29c43ddb91f09660c070962b9809d8efef78584e (diff) | |
| download | nextcloud-server-d9e333c0da352eea6731f66e7c89f63edd837426.tar.gz nextcloud-server-d9e333c0da352eea6731f66e7c89f63edd837426.zip | |
use directory from original instead of current dir
Diffstat (limited to 'core')
| -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); |