diff options
| author | Roeland Douma <unix@rullzer.com> | 2015-07-06 20:59:56 +0200 |
|---|---|---|
| committer | Roeland Douma <unix@rullzer.com> | 2015-07-06 20:59:56 +0200 |
| commit | b4f782b568560a8a0718abaa41ac800ea462b129 (patch) | |
| tree | 6342e9e518719635d6886e3997fdf99fafe8e6be /apps/files_sharing | |
| parent | e84806f017aaa206ed59938f51d949fd8e024276 (diff) | |
| parent | 868bc421cbb04054a01b05c4abbbcd16b2d451ec (diff) | |
| download | nextcloud-server-b4f782b568560a8a0718abaa41ac800ea462b129.tar.gz nextcloud-server-b4f782b568560a8a0718abaa41ac800ea462b129.zip | |
Merge pull request #16724 from owncloud/mimetype-js
Javascript to fetch mimetype icons
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/api/local.php | 1 | ||||
| -rw-r--r-- | apps/files_sharing/js/sharedfilelist.js | 2 |
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') { |