From 93dbd4ec8650844bfafd1b71c8ca1db689af83b7 Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Tue, 13 Jul 2021 22:50:51 +0200 Subject: [PATCH] rename vars in use --- js/src/admin/components/AdvancedPage.js | 4 +--- src/Foundation/ScalabilityServiceProvider.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/js/src/admin/components/AdvancedPage.js b/js/src/admin/components/AdvancedPage.js index 486ed1f8b..01739d60d 100644 --- a/js/src/admin/components/AdvancedPage.js +++ b/js/src/admin/components/AdvancedPage.js @@ -21,7 +21,6 @@ export default class AdvancedPage extends AdminPage { content() { return [
- {Object.keys(this.queueOptions).length > 1 ? [ this.buildSettingComponent({ @@ -29,7 +28,7 @@ export default class AdvancedPage extends AdminPage { setting: 'default_locale', options: this.localeOptions, label: app.translator.trans('core.admin.advanced.queue_driver_heading'), - }) + }), ] : ''} @@ -37,5 +36,4 @@ export default class AdvancedPage extends AdminPage {
, ]; } - } diff --git a/src/Foundation/ScalabilityServiceProvider.php b/src/Foundation/ScalabilityServiceProvider.php index 0bef9a104..1a41320a3 100644 --- a/src/Foundation/ScalabilityServiceProvider.php +++ b/src/Foundation/ScalabilityServiceProvider.php @@ -56,7 +56,7 @@ class ScalabilityServiceProvider extends AbstractServiceProvider // Toggles the advanced pane for admins. $event->settings['advanced_settings_pane_enabled'] = $event->settings['flarum.scalability.queue-recommended'] - ?? $config->offsetGet('advanced-settings') + ?? $config->offsetGet('advancedSettings') ?? false; } }