Skip to content

fix(SettingsManager): Adapt to change in master #1652

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

Merged
CarlSchwan merged 1 commit into from
Aug 5, 2026
+10 −7
Merged

fix(SettingsManager): Adapt to change in master #1652

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
17 changes: 10 additions & 7 deletions lib/FilteredSettingsManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,26 @@ public function __construct(
) {
}

private function isSettingAllowed(string $setting): bool {
$appId = App::getAppIdForClass($setting);
private function isSettingAllowed(string $setting, ?string $appId): bool {
// TODO when we depend on NC 34, drop App::getAppIdForClass
$appId = $appId ?? App::getAppIdForClass($setting);
return $this->appWhitelist->isAppWhitelisted($appId);
}

#[\Override]
public function registerSection(string $type, string $section): void {
$this->manager->registerSection($type, $section);
public function registerSection(string $type, string $section, ?string $appId = null): void {
/** @psalm-suppress TooManyArguments Starting with NC34, we have 3 args */
$this->manager->registerSection($type, $section, $appId);
}

#[\Override]
public function registerSetting(string $type, string $setting): void {
if (!$this->isSettingAllowed($setting)) {
public function registerSetting(string $type, string $setting, ?string $appId = null): void {
if (!$this->isSettingAllowed($setting, $appId)) {
return;
}

$this->manager->registerSetting($type, $setting);
/** @psalm-suppress TooManyArguments Starting with NC34, we have 3 args */
$this->manager->registerSetting($type, $setting, $appId);
}

#[\Override]
Expand Down
Loading