@@ -319,8 +319,11 @@ |
||
| 319 | 319 | <?php if (!isset($unique_indis[$individual->getXref()]) && $age_at_death >= 0 && $age_at_death <= $max_age): ?> |
| 320 | 320 | <?php $deat_by_age[$age_at_death] .= $individual->getSex(); ?> |
| 321 | 321 | <?php endif ?> |
| 322 | - <?php else: ?> |
|
| 323 | - <?php $age_at_death = ''; ?> |
|
| 322 | + <?php else { |
|
| 323 | + : ?> |
|
| 324 | + <?php $age_at_death = ''; |
|
| 325 | +} |
|
| 326 | +?> |
|
| 324 | 327 | <?php $age_at_death_sort = PHP_INT_MAX; ?> |
| 325 | 328 | <?php endif ?> |
| 326 | 329 | <td class="center" data-sort="<?= e($age_at_death_sort) ?>"> |
@@ -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 | |
@@ -30,7 +30,8 @@ discard block |
||
| 30 | 30 | <?= /* I18N: %s is a version number */ |
| 31 | 31 | I18N::translate('Upgrade to webtrees %s.', e($latest_version)) ?> |
| 32 | 32 | </a> |
| 33 | - <?php else: ?> |
|
| 33 | + <?php else { |
|
| 34 | + : ?> |
|
| 34 | 35 | <?= I18N::translate('This is the latest version of webtrees. No upgrade is available.') ?> |
| 35 | 36 | <?php endif ?> |
| 36 | 37 | </p> |
@@ -136,6 +137,7 @@ discard block |
||
| 136 | 137 | 'media' => $media, |
| 137 | 138 | 'notes' => $notes, |
| 138 | 139 | ]); |
| 140 | +} |
|
| 139 | 141 | ?> |
| 140 | 142 | </tbody> |
| 141 | 143 | <tfoot> |