@@ -219,7 +219,8 @@ discard block |
||
| 219 | 219 | <li class="wt-initials-list-item d-flex"> |
| 220 | 220 | <?php if ($count > 0) : ?> |
| 221 | 221 | <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
| 222 | - <?php else : ?> |
|
| 222 | + <?php else { |
|
| 223 | + : ?> |
|
| 223 | 224 | <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 224 | 225 | |
| 225 | 226 | <?php endif ?> |
@@ -273,6 +274,7 @@ discard block |
||
| 273 | 274 | |
| 274 | 275 | if ($show === 'indi' || $show === 'surn') { |
| 275 | 276 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, WT_LOCALE, I18N::collation()); |
| 277 | +} |
|
| 276 | 278 | if ($show === 'surn') { |
| 277 | 279 | // Show the surname list |
| 278 | 280 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -342,9 +342,11 @@ |
||
| 342 | 342 | 'fqpn', |
| 343 | 343 | ]; |
| 344 | 344 | |
| 345 | - if ($serverfile !== '') { // first choice is file on server |
|
| 345 | + if ($serverfile !== '') { |
|
| 346 | +// first choice is file on server |
|
| 346 | 347 | $filename = WT_DATA_DIR . 'places/' . $serverfile; |
| 347 | - } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file |
|
| 348 | + } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { |
|
| 349 | +// 2nd choice is local file |
|
| 348 | 350 | $filename = $_FILES['localfile']['tmp_name']; |
| 349 | 351 | } |
| 350 | 352 | |