Merge pull request #21769 from owncloud/sort-mimetype-list-before-saving

Sort mimetype list before saving

core/command/maintenance/mimetype/updatejs.php

@@ -71,6 +71,7 @@ class UpdateJS extends Command {
 
 		//Remove duplicates
 		$files = array_values(array_unique($files));
+		sort($files);
 
 		// Fetch all themes!
 		$themes = [];
@@ -100,6 +101,7 @@ class UpdateJS extends Command {
 
 			//Remove Duplicates
 			$themes[$theme] = array_values(array_unique($themes[$theme]));
+			sort($themes[$theme]);
 		}
 
 		//Generate the JS

core/js/mimetypelist.js

@@ -82,26 +82,26 @@ OC.MimeTypeList={
     "web": "text/code"
 },
 	files: [
-    "video",
+    "application",
+    "application-pdf",
+    "audio",
+    "file",
+    "folder",
     "folder-drag-accept",
-    "folder-starred",
+    "folder-external",
     "folder-public",
+    "folder-shared",
+    "folder-starred",
+    "image",
     "package-x-generic",
     "text",
-    "folder-external",
-    "text-vcard",
-    "application",
-    "text-code",
-    "x-office-spreadsheet",
-    "application-pdf",
-    "folder",
-    "x-office-document",
     "text-calendar",
+    "text-code",
+    "text-vcard",
+    "video",
+    "x-office-document",
     "x-office-presentation",
-    "file",
-    "folder-shared",
-    "image",
-    "audio"
+    "x-office-spreadsheet"
 ],
 	themes: []
 };