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.

Sign up for GitHub

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

Jump to bottom

Remove empty user search provider #41631

Closed
wants to merge 1 commit into from
Closed

Remove empty user search provider #41631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions apps/settings/lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
use OCA\Settings\Middleware\SubadminMiddleware;
use OCA\Settings\Search\AppSearch;
use OCA\Settings\Search\SectionSearch;
use OCA\Settings\Search\UserSearch;
use OCA\Settings\SetupChecks\BruteForceThrottler;
use OCA\Settings\SetupChecks\CheckUserCertificates;
use OCA\Settings\SetupChecks\DefaultPhoneRegionSet;
Expand Down Expand Up @@ -101,7 +100,6 @@ public function register(IRegistrationContext $context): void {
$context->registerMiddleware(SubadminMiddleware::class);
$context->registerSearchProvider(SectionSearch::class);
$context->registerSearchProvider(AppSearch::class);
$context->registerSearchProvider(UserSearch::class);

// Register listeners
$context->registerEventListener(AppPasswordCreatedEvent::class, AppPasswordCreatedActivityListener::class);
Expand Down
77 changes: 0 additions & 77 deletions apps/settings/lib/Search/UserSearch.php
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions lib/private/Search/SearchComposer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,6 @@ 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
Loading