diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-11-14 19:35:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 19:35:13 +0100 |
| commit | 1783fa71765132ac11a4dc21b299ebfa52756bca (patch) | |
| tree | 277f25737b99afa1cbc5c342db9d8f1a525b2758 | |
| parent | c414bd1c07ef5c55158b3d606af9470c75bc5414 (diff) | |
| parent | 7ac15d4baba921ae38f22712f16fbec94dd9f705 (diff) | |
| download | nextcloud-server-1783fa71765132ac11a4dc21b299ebfa52756bca.tar.gz nextcloud-server-1783fa71765132ac11a4dc21b299ebfa52756bca.zip | |
Merge pull request #12455 from nextcloud/twofactor-backup-settings
Don't register twofactor_backup settings as "regular" settings
| -rw-r--r-- | apps/twofactor_backupcodes/appinfo/info.xml | 4 | ||||
| -rw-r--r-- | lib/private/Settings/Manager.php | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/apps/twofactor_backupcodes/appinfo/info.xml b/apps/twofactor_backupcodes/appinfo/info.xml index fd575ec12bb..b28f75254b6 100644 --- a/apps/twofactor_backupcodes/appinfo/info.xml +++ b/apps/twofactor_backupcodes/appinfo/info.xml @@ -26,10 +26,6 @@ <provider>OCA\TwoFactorBackupCodes\Provider\BackupCodesProvider</provider> </two-factor-providers> - <settings> - <personal>OCA\TwoFactorBackupCodes\Settings\Personal</personal> - </settings> - <activity> <providers> <provider>OCA\TwoFactorBackupCodes\Activity\Provider</provider> diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 036f1ed594f..42ec16e223b 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -167,7 +167,7 @@ class Manager implements IManager { } if (!$setting instanceof ISettings) { - $this->log->logException(new \InvalidArgumentException('Invalid settings setting registered'), ['level' => ILogger::INFO]); + $this->log->logException(new \InvalidArgumentException('Invalid settings setting registered (' . $class . ')'), ['level' => ILogger::INFO]); continue; } |