Skip to content

Commit f29afc1

Browse files
committed
fix(userconfig): duplicate core lexicon
Signed-off-by: Maxence Lange <[email protected]>
1 parent de46e39 commit f29afc1

File tree

3 files changed

+7
-46
lines changed

3 files changed

+7
-46
lines changed

core/AppInfo/ConfigLexicon.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
*/
2121
class ConfigLexicon implements ILexicon {
2222
public const SHAREAPI_ALLOW_FEDERATION_ON_PUBLIC_SHARES = 'shareapi_allow_federation_on_public_shares';
23+
public const USER_LANG = 'lang';
24+
public const LASTCRON = 'lastcron';
2325

2426
public function getStrictness(): Strictness {
2527
return Strictness::IGNORE;
@@ -34,10 +36,13 @@ public function getAppConfigs(): array {
3436
definition: 'adds share permission to public shares to allow adding them to your Nextcloud (federation)',
3537
lazy: true,
3638
),
39+
new Entry(self::LASTCRON, ValueType::INT, 0, 'timestamp of last cron execution'),
3740
];
3841
}
3942

4043
public function getUserConfigs(): array {
41-
return [];
44+
return [
45+
new Entry(self::USER_LANG, ValueType::STRING, null, 'language'),
46+
];
4247
}
4348
}

lib/private/AppFramework/Bootstrap/RegistrationContext.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace OC\AppFramework\Bootstrap;
1111

1212
use Closure;
13-
use OC\Config\Lexicon\CoreConfigLexicon;
1413
use OC\Support\CrashReport\Registry;
1514
use OCP\AppFramework\App;
1615
use OCP\AppFramework\Bootstrap\IRegistrationContext;
@@ -144,7 +143,7 @@ class RegistrationContext {
144143
private array $declarativeSettings = [];
145144

146145
/** @var array<array-key, string> */
147-
private array $configLexiconClasses = ['core' => CoreConfigLexicon::class];
146+
private array $configLexiconClasses = [];
148147

149148
/** @var ServiceRegistration<ITeamResourceProvider>[] */
150149
private array $teamResourceProviders = [];

lib/private/Config/Lexicon/CoreConfigLexicon.php

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)