Merge pull request #41432 from nextcloud/fix/white-user-icon-search

Fix search providers icons
nextcloud · Nov 14, 2023 · e90df64 · e90df64
2 parents 93ea634 + 79d1e40
commit e90df64
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/apps/settings/img/settings.svg b/apps/settings/img/settings.svg
diff --git a/apps/settings/img/settings_apps.svg b/apps/settings/img/settings_apps.svg
diff --git a/apps/settings/img/users-white.svg b/apps/settings/img/users-white.svg
diff --git a/apps/settings/img/users.svg b/apps/settings/img/users.svg
diff --git a/lib/private/Search/SearchComposer.php b/lib/private/Search/SearchComposer.php
@@ -223,6 +223,12 @@ private function fetchIcon(string $appId, string $providerId): string {
 			[$appId, 'app.svg'],
 			['core', 'places/default-app-icon.svg'],
 		];
+		if ($appId === 'settings' && $providerId === 'users') {
+			// Conflict:
+			// the file /apps/settings/users.svg is already used in black version by top right user menu
+			// Override icon name here
+			$icons = [['settings', 'users-white.svg']];
+		}
 		foreach ($icons as $i => $icon) {
 			try {
 				return $this->urlGenerator->imagePath(... $icon);