summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGreg Roach <greg@subaqua.co.uk>2021-02-08 14:52:03 +0000
committerGreg Roach <greg@subaqua.co.uk>2021-02-08 19:40:49 +0000
commitdc270d8cc5085ed29f3f419c99734ddd0960c624 (patch)
treec7866b60b56ae044a725e781399ea4514a8d4e4b /app
parentb5c9e2c414c03c542672ad19ab2336c93c22ff1c (diff)
downloadwebtrees-dc270d8cc5085ed29f3f419c99734ddd0960c624.tar.gz
webtrees-dc270d8cc5085ed29f3f419c99734ddd0960c624.tar.bz2
webtrees-dc270d8cc5085ed29f3f419c99734ddd0960c624.zip
CodeStyle
Diffstat (limited to 'app')
-rw-r--r--app/Http/RequestHandlers/SetupWizard.php2
-rw-r--r--app/Module/YahrzeitModule.php18
2 files changed, 10 insertions, 10 deletions
diff --git a/app/Http/RequestHandlers/SetupWizard.php b/app/Http/RequestHandlers/SetupWizard.php
index 795ba0c674..e202267f90 100644
--- a/app/Http/RequestHandlers/SetupWizard.php
+++ b/app/Http/RequestHandlers/SetupWizard.php
@@ -164,7 +164,7 @@ class SetupWizard implements RequestHandlerInterface
I18N::init($data['lang'], true);
$data['cpu_limit'] = $this->maxExecutionTime();
- $data['locales'] = $locales->all();
+ $data['locales'] = $locales;
$data['memory_limit'] = $this->memoryLimit();
// Only show database errors after the user has chosen a driver.
diff --git a/app/Module/YahrzeitModule.php b/app/Module/YahrzeitModule.php
index f8a1076edf..cf6cabdd73 100644
--- a/app/Module/YahrzeitModule.php
+++ b/app/Module/YahrzeitModule.php
@@ -248,9 +248,9 @@ class YahrzeitModule extends AbstractModule implements ModuleBlockInterface
*/
public function editBlockConfiguration(Tree $tree, int $block_id): string
{
- $calendar = $this->getBlockSetting($block_id, 'calendar', 'jewish');
- $days = $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
- $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
+ $calendar = $this->getBlockSetting($block_id, 'calendar', 'jewish');
+ $days = $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
+ $info_style = $this->getBlockSetting($block_id, 'infoStyle', 'table');
$styles = [
/* I18N: An option in a list-box */
@@ -265,12 +265,12 @@ class YahrzeitModule extends AbstractModule implements ModuleBlockInterface
];
return view('modules/yahrzeit/config', [
- 'calendar' => $calendar,
- 'calendars' => $calendars,
- 'days' => $days,
- 'infoStyle' => $infoStyle,
- 'max_days' => self::MAX_DAYS,
- 'styles' => $styles,
+ 'calendar' => $calendar,
+ 'calendars' => $calendars,
+ 'days' => $days,
+ 'info_style' => $info_style,
+ 'max_days' => self::MAX_DAYS,
+ 'styles' => $styles,
]);
}
}