@@ -840,9 +840,9 @@ |
||
840 | 840 | } |
841 | 841 | |
842 | 842 | foreach ([ |
843 | - 'main' => $main_blocks, |
|
844 | - 'side' => $side_blocks, |
|
845 | - ] as $location => $updated_blocks) { |
|
843 | + 'main' => $main_blocks, |
|
844 | + 'side' => $side_blocks, |
|
845 | + ] as $location => $updated_blocks) { |
|
846 | 846 | foreach ($updated_blocks as $block_order => $block_id) { |
847 | 847 | if (is_numeric($block_id)) { |
848 | 848 | // Updated block |
@@ -399,19 +399,19 @@ |
||
399 | 399 | private function faqsExist(Tree $tree, string $language): bool |
400 | 400 | { |
401 | 401 | return DB::table('block') |
402 | - ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id') |
|
403 | - ->where('module_name', '=', $this->name()) |
|
404 | - ->where('setting_name', '=', 'languages') |
|
405 | - ->where(function (Builder $query) use ($tree): void { |
|
406 | - $query |
|
407 | - ->whereNull('gedcom_id') |
|
408 | - ->orWhere('gedcom_id', '=', $tree->id()); |
|
409 | - }) |
|
410 | - ->select(['setting_value AS languages']) |
|
411 | - ->get() |
|
412 | - ->filter(function (stdClass $faq) use ($language): bool { |
|
413 | - return $faq->languages === '' || in_array($language, explode(',', $faq->languages)); |
|
414 | - }) |
|
402 | + ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id') |
|
403 | + ->where('module_name', '=', $this->name()) |
|
404 | + ->where('setting_name', '=', 'languages') |
|
405 | + ->where(function (Builder $query) use ($tree): void { |
|
406 | + $query |
|
407 | + ->whereNull('gedcom_id') |
|
408 | + ->orWhere('gedcom_id', '=', $tree->id()); |
|
409 | + }) |
|
410 | + ->select(['setting_value AS languages']) |
|
411 | + ->get() |
|
412 | + ->filter(function (stdClass $faq) use ($language): bool { |
|
413 | + return $faq->languages === '' || in_array($language, explode(',', $faq->languages)); |
|
414 | + }) |
|
415 | 415 | ->isNotEmpty(); |
416 | 416 | } |
417 | 417 | } |
@@ -102,9 +102,9 @@ |
||
102 | 102 | ->groupBy(['century', 'sex']); |
103 | 103 | |
104 | 104 | return $male->unionAll($female) |
105 | - ->orderBy('century') |
|
106 | - ->get() |
|
107 | - ->all(); |
|
105 | + ->orderBy('century') |
|
106 | + ->get() |
|
107 | + ->all(); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -322,10 +322,10 @@ |
||
322 | 322 | } |
323 | 323 | // print gedcom ages |
324 | 324 | foreach ([ |
325 | - I18N::translate('Age') => $fact_age, |
|
326 | - I18N::translate('Husband') => $husb_age, |
|
327 | - I18N::translate('Wife') => $wife_age, |
|
328 | - ] as $label => $age) { |
|
325 | + I18N::translate('Age') => $fact_age, |
|
326 | + I18N::translate('Husband') => $husb_age, |
|
327 | + I18N::translate('Wife') => $wife_age, |
|
328 | + ] as $label => $age) { |
|
329 | 329 | if ($age !== '') { |
330 | 330 | $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>'; |
331 | 331 | } |