Fix file picker to correctly show SVG file icons

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 6fc8d4d35238e9a391b43715e12e1f54799490a5..4888fc1eea5e4d62337ff9b70f5af657cfb196b1 100644 (file)
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -557,7 +557,6 @@ var OCdialogs = {
                                        filename: entry.name,
                                        date: OC.mtime2date(Math.floor(entry.mtime / 1000))
                                });
-                               $li.find('img').attr('src', entry.icon);
                                if (entry.isPreviewAvailable) {
                                        var urlSpec = {
                                                file: dir + '/' + entry.name
@@ -565,10 +564,16 @@ var OCdialogs = {
                                        var previewUrl = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
                                        $li.find('img').attr('src', previewUrl);
                                }
+                               else {
+                                       $li.find('img').attr('src', OC.Util.replaceSVGIcon(entry.icon));
+                               }
                                self.$filelist.append($li);
                        });
 
                        self.$filelist.removeClass('loading');
+                       if (!OC.Util.hasSVGSupport()) {
+                               OC.Util.replaceSVG(self.$filePicker.find('.dirtree'));
+                       }
                });
        },
        /**