Show mime icon, bump bundles, make the SearchResultEntry class non-abstract, Fix header search icon, various fixes

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

1 files changed, 15 insertions, 6 deletions

diff --git a/lib/private/Search/SearchComposer.php b/lib/private/Search/SearchComposer.php
index dd4edfc5f40..7ba6296c9de 100644
--- a/lib/private/Search/SearchComposer.php
+++ b/lib/private/Search/SearchComposer.php
@@ -107,22 +107,31 @@ class SearchComposer {
 
 	/**
 	 * Get a list of all provider IDs & Names for the consecutive calls to `search`
+	 * Sort the list by the order property
 	 *
 	 * @return array
 	 */
 	public function getProviders(): array {
 		$this->loadLazyProviders();
 
-		/**
-		 * Return an array with the IDs, but strip the associative keys
-		 */
-		return array_values(
+		$providers = array_values(
 			array_map(function (IProvider $provider) {
 				return [
 					'id' => $provider->getId(),
-					'name' => $provider->getName()
+					'name' => $provider->getName(),
+					'order' => $provider->getOrder()
 				];
-			}, $this->providers));
+			}, $this->providers)
+		);
+
+		usort($providers, function ($provider1, $provider2) {
+			return $provider1['order'] <=> $provider2['order'];
+		});
+
+		/**
+		 * Return an array with the IDs, but strip the associative keys
+		 */
+		return $providers;
 	}
 
 	/**