@@ -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 | /** |
@@ -1,4 +1,4 @@ |
||
1 | 1 | <?php return array ( |
2 | - '%H:%i:%s' => '%g:%i:%s %a', |
|
3 | - '%j %F %Y' => '%F %j, %Y', |
|
2 | + '%H:%i:%s' => '%g:%i:%s %a', |
|
3 | + '%j %F %Y' => '%F %j, %Y', |
|
4 | 4 | ); |
@@ -13,7 +13,8 @@ |
||
13 | 13 | use Fisharebest\Webtrees\Services\ServerCheckService; |
14 | 14 | use Illuminate\Database\Capsule\Manager as DB; |
15 | 15 | |
16 | -return new class extends AbstractModule implements ModuleCustomInterface { |
|
16 | +return new class extends AbstractModule implements ModuleCustomInterface |
|
17 | +{ |
|
17 | 18 | use ModuleCustomTrait; |
18 | 19 | |
19 | 20 | /** @var ServerCheckService */ |
@@ -15,7 +15,8 @@ |
||
15 | 15 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
16 | 16 | use Fisharebest\Webtrees\Tree; |
17 | 17 | |
18 | -return new class extends AbstractModule implements ModuleCustomInterface { |
|
18 | +return new class extends AbstractModule implements ModuleCustomInterface |
|
19 | +{ |
|
19 | 20 | use ModuleCustomTrait; |
20 | 21 | |
21 | 22 | /** |
@@ -13,7 +13,8 @@ |
||
13 | 13 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
14 | 14 | use Fisharebest\Webtrees\View; |
15 | 15 | |
16 | -return new class extends MinimalTheme implements ModuleCustomInterface { |
|
16 | +return new class extends MinimalTheme implements ModuleCustomInterface |
|
17 | +{ |
|
17 | 18 | use ModuleCustomTrait; |
18 | 19 | |
19 | 20 | /** |
@@ -370,10 +370,10 @@ |
||
370 | 370 | } |
371 | 371 | |
372 | 372 | /** |
373 | - * @param ServerRequestInterface $request |
|
374 | - * |
|
375 | - * @return ResponseInterface |
|
376 | - */ |
|
373 | + * @param ServerRequestInterface $request |
|
374 | + * |
|
375 | + * @return ResponseInterface |
|
376 | + */ |
|
377 | 377 | public function duplicates(ServerRequestInterface $request): ResponseInterface |
378 | 378 | { |
379 | 379 | $tree = $request->getAttribute('tree'); |
@@ -240,7 +240,8 @@ discard block |
||
240 | 240 | <li class="wt-initials-list-item d-flex"> |
241 | 241 | <?php if ($count > 0) : ?> |
242 | 242 | <a href="<?= e(route('module', ['module' => $module, 'action' => $action, 'alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
243 | - <?php else : ?> |
|
243 | + <?php else { |
|
244 | + : ?> |
|
244 | 245 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
245 | 246 | |
246 | 247 | <?php endif ?> |
@@ -294,6 +295,7 @@ discard block |
||
294 | 295 | |
295 | 296 | if ($show === 'indi' || $show === 'surn') { |
296 | 297 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, WT_LOCALE, I18N::collation()); |
298 | +} |
|
297 | 299 | if ($show === 'surn') { |
298 | 300 | // Show the surname list |
299 | 301 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -382,7 +382,7 @@ |
||
382 | 382 | |
383 | 383 | // One is a substring of the other. e.g. Halen / Van Halen |
384 | 384 | return stripos($surname1, $surname2) !== false || stripos($surname2, $surname1) !== false; |
385 | - } |
|
385 | + } |
|
386 | 386 | |
387 | 387 | /** |
388 | 388 | * Convert a SOSA number into a generation number. e.g. 8 = great-grandfather = 3 generations |
@@ -36,7 +36,7 @@ |
||
36 | 36 | */ |
37 | 37 | class EditIndividualController extends AbstractEditController |
38 | 38 | { |
39 | - /** |
|
39 | + /** |
|
40 | 40 | * Add a child to an existing individual (creating a one-parent family). |
41 | 41 | * |
42 | 42 | * @param ServerRequestInterface $request |