summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2015-07-02 16:59:59 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2015-07-06 16:32:15 +0200
commit868bc421cbb04054a01b05c4abbbcd16b2d451ec (patch)
treef2d10c2265b955f01934f9ebcd60d3a15b1d1bfe /apps
parentc8145cdbd6160788569d00fbc267abd08ae019c9 (diff)
downloadnextcloud-server-868bc421cbb04054a01b05c4abbbcd16b2d451ec.tar.gz
nextcloud-server-868bc421cbb04054a01b05c4abbbcd16b2d451ec.zip
Share app no longer use the OCS API icon
Switch to new javascript mimetype resolver
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/api/local.php1
-rw-r--r--apps/files_sharing/js/sharedfilelist.js2
2 files changed, 1 insertions, 2 deletions
diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php
index b0ddba9fa11..2b2b475466f 100644
--- a/apps/files_sharing/api/local.php
+++ b/apps/files_sharing/api/local.php
@@ -69,7 +69,6 @@ class Local {
if (\OC::$server->getPreviewManager()->isMimeSupported($share['mimetype'])) {
$share['isPreviewAvailable'] = true;
}
- $share['icon'] = substr(\OC_Helper::mimetypeIcon($share['mimetype']), 0, -3) . 'svg';
}
if (!is_null($share['token'])) {
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index ca187940a08..98dbd4c6702 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -176,7 +176,7 @@
.map(function(share) {
var file = {
id: share.file_source,
- icon: share.icon,
+ icon: OC.MimeType.getIconUrl(share.mimetype),
mimetype: share.mimetype
};
if (share.item_type === 'folder') {