Fix the mimetype filter in OC_Share_Backend_File

diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 6409c43e134325c64e7d75ed64a73dffafc31a23..074ca9928d471e1cf1266cb7f22ddb7c46c56f7d 100644 (file)
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -72,12 +72,14 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
                        // Only 1 item should come through for this format call
                        return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions']);
                } else if ($format == self::FORMAT_FILE_APP) {
-                       if (isset($parameters['mimetype_filter'])) {
+                       if (isset($parameters['mimetype_filter']) && $parameters['mimetype_filter']) {
                                $mimetype_filter = $parameters['mimetype_filter'];
                        }
                        $files = array();
                        foreach ($items as $item) {
-                               if (isset($mimetype_filter) && strpos($item['mimetype'], $mimetype_filter) !== 0) {
+                               if (isset($mimetype_filter)
+                                       && strpos($item['mimetype'], $mimetype_filter) !== 0
+                                       && $item['mimetype'] != 'httpd/unix-directory') {
                                        continue;
                                }
                                $file = array();