diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-07-13 13:41:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-13 13:41:31 +0200 |
| commit | e335121d5ead8b8a223ca12212529c2230bc1c5d (patch) | |
| tree | 67c7d37db38d9147c4352ff55c66bffe7dfbe0cc /core | |
| parent | f71457782b1c0e6aa66ba6b2aac126aa5a2bc9dc (diff) | |
| parent | ce5ad7e7f48751b25ef9dd377fbbface2adb30b4 (diff) | |
| download | nextcloud-server-e335121d5ead8b8a223ca12212529c2230bc1c5d.tar.gz nextcloud-server-e335121d5ead8b8a223ca12212529c2230bc1c5d.zip | |
Merge pull request #5070 from nextcloud/theming-vs-themes
Prefer custom theme over the theming app
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/mimetype.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/mimetype.js b/core/js/mimetype.js index 8920fe09a7e..ed4fedc7f8a 100644 --- a/core/js/mimetype.js +++ b/core/js/mimetype.js @@ -91,7 +91,7 @@ OC.MimeType = { path += icon; } } - if(OCA.Theming) { + if(OCA.Theming && gotIcon === null) { path = OC.generateUrl('/apps/theming/img/core/filetypes/'); path += OC.MimeType._getFile(mimeType, OC.MimeTypeList.files); gotIcon = true; |