fisharebest / webtrees

app/Http/Controllers/AdminLocationController.php

Braces +4 added lines, -2 removed lines

@@ -342,9 +342,11 @@
             'fqpn',
         ];
 
-        if ($serverfile !== '') {  // first choice is file on server
+        if ($serverfile !== '') {
+// first choice is file on server
             $filename = WT_DATA_DIR . 'places/' . $serverfile;
-        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file
+        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) {
+// 2nd choice is local file
             $filename = $_FILES['localfile']['tmp_name'];
         }
 

app/Http/Controllers/ListController.php

Braces +3 added lines, -1 removed lines

@@ -216,7 +216,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <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>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
 
                         <?php endif ?>
@@ -270,6 +271,7 @@ 
 
             if ($show === 'indi' || $show === 'surn') {
                 $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families);
+}
                 if ($show === 'surn') {
                     // Show the surname list
                     switch ($tree->getPreference('SURNAME_LIST_STYLE')) {