Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix search providers icons #41432

Merged
merged 2 commits into from Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/settings/img/settings.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/settings/img/settings_apps.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/settings/img/users-white.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion apps/settings/img/users.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions lib/private/Search/SearchComposer.php
Expand Up @@ -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);
Expand Down