diff options
| author | Julius Härtl <jus@bitgrid.net> | 2017-05-23 15:20:54 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2017-07-12 11:42:15 +0200 |
| commit | ce5ad7e7f48751b25ef9dd377fbbface2adb30b4 (patch) | |
| tree | 7a9b951dd6458071ac8db0fa016d7c8fe5a6a348 /core/js | |
| parent | d23bc9a99a6aa59aac9a0635ebbb7fa95fcba05a (diff) | |
| download | nextcloud-server-ce5ad7e7f48751b25ef9dd377fbbface2adb30b4.tar.gz nextcloud-server-ce5ad7e7f48751b25ef9dd377fbbface2adb30b4.zip | |
Prefer custom theme over theming app
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core/js')
| -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; |