8 files changed, 24 insertions, 6 deletions
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index c7977200ba6..ae14ee4d65e 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "PHP %s or higher is required." : "Se requiere PHP %s o superior.",
     "PHP with a version lower than %s is required." : "Se necesita una versión de PHP inferior a %s",
     "%sbit or higher PHP required." : "Se requiere PHP %sbit o superior.",
+    "The following architectures are supported: %s" : "Las siguientes arquitecturas están soportadas: %s",
     "The following databases are supported: %s" : "Las siguientes bases de datos están soportadas: %s",
     "The command line tool %s could not be found" : "No se encontró la herramienta %s de línea de comandos",
     "The library %s is not available." : "La biblioteca %s no está disponible",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index 272ffbf5a5b..fb6e53ef82d 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -21,6 +21,7 @@
     "PHP %s or higher is required." : "Se requiere PHP %s o superior.",
     "PHP with a version lower than %s is required." : "Se necesita una versión de PHP inferior a %s",
     "%sbit or higher PHP required." : "Se requiere PHP %sbit o superior.",
+    "The following architectures are supported: %s" : "Las siguientes arquitecturas están soportadas: %s",
     "The following databases are supported: %s" : "Las siguientes bases de datos están soportadas: %s",
     "The command line tool %s could not be found" : "No se encontró la herramienta %s de línea de comandos",
     "The library %s is not available." : "La biblioteca %s no está disponible",
diff --git a/lib/private/Collaboration/Collaborators/Search.php b/lib/private/Collaboration/Collaborators/Search.php
index 69027e7b553..788804971a3 100644
--- a/lib/private/Collaboration/Collaborators/Search.php
+++ b/lib/private/Collaboration/Collaborators/Search.php
@@ -88,9 +88,10 @@ class Search implements ISearch {
 			$searchResult->unsetResult($emailType);
 		}
 
-		// if we have an exact local user match, there is no need to show the remote and email matches
+		// if we have an exact local user match with an email-a-like query,
+		// there is no need to show the remote and email matches.
 		$userType = new SearchResultType('users');
-		if($searchResult->hasExactIdMatch($userType)) {
+		if (strpos($search, '@') !== false && $searchResult->hasExactIdMatch($userType)) {
 			$searchResult->unsetResult($remoteType);
 			$searchResult->unsetResult($emailType);
 		}
diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php
index c92f7bb0b6e..1d6e0fc0c06 100644
--- a/lib/private/Collaboration/Collaborators/UserPlugin.php
+++ b/lib/private/Collaboration/Collaborators/UserPlugin.php
@@ -101,9 +101,9 @@ class UserPlugin implements ISearchPlugin {
 			$userEmail = $user->getEMailAddress();
 			$uid = (string) $uid;
 			if (
-				strtolower($uid) === $lowerSearch ||
+				$lowerSearch !== '' && (strtolower($uid) === $lowerSearch ||
 				strtolower($userDisplayName) === $lowerSearch ||
-				strtolower($userEmail) === $lowerSearch
+				strtolower($userEmail) === $lowerSearch)
 			) {
 				if (strtolower($uid) === $lowerSearch) {
 					$foundUserById = true;
diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php
index 9cf3b43a431..32bfd5a71f3 100644
--- a/lib/private/Files/Config/UserMountCache.php
+++ b/lib/private/Files/Config/UserMountCache.php
@@ -409,4 +409,9 @@ class UserMountCache implements IUserMountCache {
 		$result->closeCursor();
 		return $results;
 	}
+
+	public function clear(): void {
+		$this->cacheInfoCache = new CappedMemoryCache();
+		$this->mountsForUsers = new CappedMemoryCache();
+	}
 }
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index 5b6bea63c6b..4ab5cf61965 100644
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -357,7 +357,8 @@ class Manager implements IManager {
 		];
 
 		$legacyForms = \OC_App::getForms('personal');
-		if (!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms)) {
+		if ((!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms))
+			|| count($this->getPersonalSettings('additional')) > 1) {
 			$sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
 		}
 
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php
index 19c9ca7f91c..0f7b2d1b3af 100644
--- a/lib/private/legacy/helper.php
+++ b/lib/private/legacy/helper.php
@@ -494,7 +494,8 @@ class OC_Helper {
 			$used = 0;
 		}
 		$quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
-		$storage = $rootInfo->getStorage();
+		$mount = $rootInfo->getMountPoint();
+		$storage = $mount->getStorage();
 		$sourceStorage = $storage;
 		if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
 			$includeExtStorage = false;
@@ -552,6 +553,7 @@ class OC_Helper {
 			'relative' => $relative,
 			'owner' => $ownerId,
 			'ownerDisplayName' => $ownerDisplayName,
+			'mountType' => $mount->getMountType()
 		];
 	}
 
diff --git a/lib/public/Files/Config/IUserMountCache.php b/lib/public/Files/Config/IUserMountCache.php
index 9fca98dc843..fde4898bd39 100644
--- a/lib/public/Files/Config/IUserMountCache.php
+++ b/lib/public/Files/Config/IUserMountCache.php
@@ -117,4 +117,11 @@ interface IUserMountCache {
 	 * @since 13.0.0
 	 */
 	public function getUsedSpaceForUsers(array $users);
+
+	/**
+	 * Clear all entries from the in-memory cache
+	 *
+	 * @since 20.0.0
+	 */
+	public function clear(): void;
 }