@@ -308,7 +308,7 @@ |
||
308 | 308 | if ($request->getAttribute('route') === 'tree-page') { |
309 | 309 | $tree = $request->getAttribute('tree'); |
310 | 310 | assert($tree instanceof Tree); |
311 | - $redirect = route('user-page', ['tree' => $tree->name()]); |
|
311 | + $redirect = route('user-page', ['tree' => $tree->name()]); |
|
312 | 312 | } |
313 | 313 | |
314 | 314 | // Stay on the same tree page |
@@ -41,7 +41,7 @@ |
||
41 | 41 | */ |
42 | 42 | public function handle(ServerRequestInterface $request): ResponseInterface |
43 | 43 | { |
44 | - $tree = $request->getQueryParams()['ged']; |
|
44 | + $tree = $request->getQueryParams()['ged']; |
|
45 | 45 | assert(is_string($tree)); |
46 | 46 | |
47 | 47 | $xref = $request->getQueryParams()['mid']; |
@@ -249,7 +249,8 @@ discard block |
||
249 | 249 | <li class="wt-initials-list-item d-flex"> |
250 | 250 | <?php if ($count > 0) : ?> |
251 | 251 | <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> |
252 | - <?php else : ?> |
|
252 | + <?php else { |
|
253 | + : ?> |
|
253 | 254 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
254 | 255 | |
255 | 256 | <?php endif ?> |
@@ -303,6 +304,7 @@ discard block |
||
303 | 304 | |
304 | 305 | if ($show === 'indi' || $show === 'surn') { |
305 | 306 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, $locale->languageTag(), I18N::collation()); |
307 | +} |
|
306 | 308 | if ($show === 'surn') { |
307 | 309 | // Show the surname list |
308 | 310 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |