@@ -188,7 +188,7 @@ |
||
| 188 | 188 | $params['tree'] = $media_file->media()->tree()->name(); |
| 189 | 189 | $this->glideSignature()->validateRequest('', $params); |
| 190 | 190 | |
| 191 | - $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') . $media_file->filename(); |
|
| 191 | + $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') . $media_file->filename(); |
|
| 192 | 192 | $folder = dirname($path); |
| 193 | 193 | |
| 194 | 194 | $cache_path = 'thumbnail-cache/' . md5($folder); |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | $url_route = $params['route'] ?? '/'; |
| 72 | 72 | $uri = $uri->withPath($url_route); |
| 73 | 73 | unset($params['route']); |
| 74 | - $uri = $uri->withQuery(http_build_query($params, '', '&', PHP_QUERY_RFC3986)); |
|
| 74 | + $uri = $uri->withQuery(http_build_query($params, '', '&', PHP_QUERY_RFC3986)); |
|
| 75 | 75 | $temp_request = $request->withUri($uri)->withQueryParams($params); |
| 76 | 76 | } else { |
| 77 | 77 | $temp_request = $request; |
@@ -124,7 +124,7 @@ |
||
| 124 | 124 | */ |
| 125 | 125 | public function findByName($name): ?Tree |
| 126 | 126 | { |
| 127 | - return $this->all()->first(static function (Tree $tree) use ($name): bool { |
|
| 127 | + return $this->all()->first(static function (Tree $tree) use ($name) : bool { |
|
| 128 | 128 | return $tree->name() === $name; |
| 129 | 129 | }); |
| 130 | 130 | } |
@@ -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'); |
@@ -166,7 +166,7 @@ |
||
| 166 | 166 | 'tree' => $tree->name(), |
| 167 | 167 | 'show_all' => 'yes', |
| 168 | 168 | ]; |
| 169 | - $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 169 | + $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 170 | 170 | } |
| 171 | 171 | } elseif ($surname) { |
| 172 | 172 | $alpha = $this->localization_service->initialLetter($surname); // so we can highlight the initial letter |
@@ -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')) { |