fisharebest / webtrees

app/Http/Controllers/Admin/LocationController.php

Braces +4 added lines, -2 removed lines

@@ -334,9 +334,11 @@
             'fqpn',
         ];
 
-        if ($serverfile !== '' && is_dir(WT_DATA_DIR . 'places')) {  // first choice is file on server
+        if ($serverfile !== '' && is_dir(WT_DATA_DIR . 'places')) {
+// first choice is file on server
             $filename = WT_DATA_DIR . 'places/' . $serverfile;
-        } elseif ($request->files->has('localfile')) { // 2nd choice is local file
+        } elseif ($request->files->has('localfile')) {
+// 2nd choice is local file
             $filename = $request->files->get('localfile')->getPathName();
         }
 

app/Http/Controllers/ListController.php

Braces +3 added lines, -1 removed lines

@@ -233,7 +233,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <a href="<?= e(route('module', ['module' => $module, 'action' => $action, 'alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
 
                         <?php endif ?>
@@ -287,6 +288,7 @@ 
 
             if ($show === 'indi' || $show === 'surn') {
                 $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, WT_LOCALE, I18N::collation());
+}
                 if ($show === 'surn') {
                     // Show the surname list
                     switch ($tree->getPreference('SURNAME_LIST_STYLE')) {