HTML validation - empty <option></option> is not allowed

14 files changed, 17 insertions, 17 deletions

diff --git a/resources/views/admin/data-fix-select.phtml b/resources/views/admin/data-fix-select.phtml
index 204527c4ad..b82cbe0afc 100644
--- a/resources/views/admin/data-fix-select.phtml
+++ b/resources/views/admin/data-fix-select.phtml
@@ -29,7 +29,7 @@ use Illuminate\Support\Collection;
         </label>
         <div class="col-sm-9">
             <select class="form-control" id="data_fix" name="data_fix" type="text" required>
-                <option></option>
+                <option value="">&nbsp;</option>
                 <?php foreach ($data_fixes as $data_fix) : ?>
                     <option value="<?= $data_fix->name() ?>">
                         <?= $data_fix->title() ?>
diff --git a/resources/views/admin/trees-import.phtml b/resources/views/admin/trees-import.phtml
index 8012bf8050..6403382128 100644
--- a/resources/views/admin/trees-import.phtml
+++ b/resources/views/admin/trees-import.phtml
@@ -48,7 +48,7 @@ use Fisharebest\Webtrees\View;
                                 </span>
                             </div>
                             <select name="tree_name" class="form-control" dir="ltr" id="import-server-file">
-                                <option value=""></option>
+                                <option value="">&nbsp;</option>
                                 <?php foreach ($gedcom_files as $gedcom_file) : ?>
                                     <option value="<?= e($gedcom_file) ?>" <?= $gedcom_file === $default_gedcom_file ? 'selected' : '' ?>>
                                         <?= e($gedcom_file) ?>
diff --git a/resources/views/admin/trees-preferences.phtml b/resources/views/admin/trees-preferences.phtml
index e3f19f9f34..2adb910665 100644
--- a/resources/views/admin/trees-preferences.phtml
+++ b/resources/views/admin/trees-preferences.phtml
@@ -149,7 +149,7 @@ use Fisharebest\Webtrees\I18N;
         </label>
         <div class="col-sm-9">
             <select id="CONTACT_USER_ID" name="CONTACT_USER_ID" class="form-control">
-                <option value=""></option>
+                <option value="">&nbsp;</option>
                 <?php foreach ($members as $member) : ?>
                     <option value="<?= $member->id() ?>" <?= (int) $tree->getPreference('CONTACT_USER_ID') === $member->id() ? 'selected' : '' ?>>
                         <?= e($member->realName()) ?> - <?= e($member->userName()) ?>
@@ -169,7 +169,7 @@ use Fisharebest\Webtrees\I18N;
         </label>
         <div class="col-sm-9">
             <select id="WEBMASTER_USER_ID" name="WEBMASTER_USER_ID" class="form-control">
-                <option value=""></option>
+                <option value="">&nbsp;</option>
                 <?php foreach ($members as $member) : ?>
                     <option value="<?= $member->id() ?>" <?= (int) $tree->getPreference('WEBMASTER_USER_ID') === $member->id() ? 'selected' : '' ?>>
                         <?= e($member->realName()) ?> - <?= e($member->userName()) ?>
diff --git a/resources/views/components/select-family.phtml b/resources/views/components/select-family.phtml
index 4b70d1d98e..0a07b11d58 100644
--- a/resources/views/components/select-family.phtml
+++ b/resources/views/components/select-family.phtml
@@ -34,6 +34,6 @@ style="width:100%"
             <?= view('selects/family', ['family' => $family]) ?>
         </option>
     <?php else : ?>
-        <option></option>
+        <option value="">&nbsp;</option>
     <?php endif ?>
 </select>
diff --git a/resources/views/components/select-individual.phtml b/resources/views/components/select-individual.phtml
index 5ce406ec23..cac7bfeeb1 100644
--- a/resources/views/components/select-individual.phtml
+++ b/resources/views/components/select-individual.phtml
@@ -34,6 +34,6 @@ use Fisharebest\Webtrees\Tree;
             <?= view('selects/individual', ['individual' => $individual]) ?>
         </option>
     <?php else : ?>
-        <option></option>
+        <option value="">&nbsp;</option>
     <?php endif ?>
 </select>
diff --git a/resources/views/components/select-media.phtml b/resources/views/components/select-media.phtml
index 9263db5742..2e92f7622f 100644
--- a/resources/views/components/select-media.phtml
+++ b/resources/views/components/select-media.phtml
@@ -34,6 +34,6 @@ use Fisharebest\Webtrees\Tree;
             <?= view('selects/media', ['media' => $media]) ?>
         </option>
     <?php else : ?>
-        <option></option>
+        <option value="">&nbsp;</option>
     <?php endif ?>
 </select>
diff --git a/resources/views/components/select-note.phtml b/resources/views/components/select-note.phtml
index a415865362..592bef96af 100644
--- a/resources/views/components/select-note.phtml
+++ b/resources/views/components/select-note.phtml
@@ -34,6 +34,6 @@ use Fisharebest\Webtrees\Tree;
             <?= view('selects/note', ['note' => $note]) ?>
         </option>
     <?php else : ?>
-        <option></option>
+        <option value="">&nbsp;</option>
     <?php endif ?>
 </select>
diff --git a/resources/views/components/select-place.phtml b/resources/views/components/select-place.phtml
index 161c1792d7..6a8b0b5197 100644
--- a/resources/views/components/select-place.phtml
+++ b/resources/views/components/select-place.phtml
@@ -34,6 +34,6 @@ use Fisharebest\Webtrees\Tree;
             <?= view('selects/place', ['place' => $place]) ?>
         </option>
     <?php else : ?>
-        <option></option>
+        <option value="">&nbsp;</option>
     <?php endif ?>
 </select>
diff --git a/resources/views/components/select-repository.phtml b/resources/views/components/select-repository.phtml
index afe9ed7495..27b94ef924 100644
--- a/resources/views/components/select-repository.phtml
+++ b/resources/views/components/select-repository.phtml
@@ -34,6 +34,6 @@ use Fisharebest\Webtrees\Tree;
             <?= view('selects/repository', ['repository' => $repository]) ?>
         </option>
     <?php else : ?>
-        <option></option>
+        <option value="">&nbsp;</option>
     <?php endif ?>
 </select>
diff --git a/resources/views/components/select-source.phtml b/resources/views/components/select-source.phtml
index 2baad5c47c..9ee20e5b61 100644
--- a/resources/views/components/select-source.phtml
+++ b/resources/views/components/select-source.phtml
@@ -34,6 +34,6 @@ use Fisharebest\Webtrees\Tree;
             <?= view('selects/source', ['source' => $source]) ?>
         </option>
     <?php else : ?>
-        <option></option>
+        <option value="">&nbsp;</option>
     <?php endif ?>
 </select>
diff --git a/resources/views/components/select-submitter.phtml b/resources/views/components/select-submitter.phtml
index b1d5294f95..cb304bab63 100644
--- a/resources/views/components/select-submitter.phtml
+++ b/resources/views/components/select-submitter.phtml
@@ -34,6 +34,6 @@ use Fisharebest\Webtrees\Tree;
             <?= view('selects/submitter', ['submitter' => $submitter]) ?>
         </option>
     <?php else : ?>
-        <option></option>
+        <option value="">&nbsp;</option>
     <?php endif ?>
 </select>
diff --git a/resources/views/components/select.phtml b/resources/views/components/select.phtml
index 6d5be54f59..04f6a80ebd 100644
--- a/resources/views/components/select.phtml
+++ b/resources/views/components/select.phtml
@@ -17,8 +17,8 @@
     <?= is_array($selected) ? 'multiple' : '' ?>
 >
     <?php foreach ($options as $key => $value) : ?>
-        <option value="<?= e((string) $key) ?>" <?= is_array($selected) && in_array($key, $selected, false) || !is_array($selected) && (string) $key === (string) $selected ?  'selected' : '' ?>>
-            <?= e($value) ?>
+        <option value="<?= e((string) $key) ?>" <?= (is_array($selected) ? in_array($key, $selected, false) : (string) $key === (string) $selected) ?  'selected' : '' ?>>
+            <?= $value === '' ? '&nbsp;' : e($value) ?>
         </option>
     <?php endforeach ?>
 </select>
diff --git a/resources/views/modals/restriction-fields.phtml b/resources/views/modals/restriction-fields.phtml
index 797a06f33e..5a2fccc204 100644
--- a/resources/views/modals/restriction-fields.phtml
+++ b/resources/views/modals/restriction-fields.phtml
@@ -10,7 +10,7 @@ use Fisharebest\Webtrees\I18N;
     </label>
     <div class="col-sm-4">
         <select class="form-control" id="privacy-restriction" name="privacy-restriction">
-            <option value=""></option>
+            <option value="">&nbsp;</option>
             <option value="none">
                 <?= I18N::translate('Show to visitors') ?>
             </option>
@@ -27,7 +27,7 @@ use Fisharebest\Webtrees\I18N;
     </label>
     <div class="col-sm-4">
         <select class="form-control" id="edit-restriction" name="edit-restriction">
-            <option value=""></option>
+            <option value="">&nbsp;</option>
             <option value="locked">
                 <?= I18N::translate('Only managers can edit') ?>
             </option>
diff --git a/resources/views/modules/GEDFact_assistant/select-census.phtml b/resources/views/modules/GEDFact_assistant/select-census.phtml
index 4ec74c7c62..0231fb3b31 100644
--- a/resources/views/modules/GEDFact_assistant/select-census.phtml
+++ b/resources/views/modules/GEDFact_assistant/select-census.phtml
@@ -19,7 +19,7 @@ use Fisharebest\Webtrees\Date;
     <option value=""><?= I18N::translate('Census date') ?></option>
 
     <?php foreach ($census_places as $census_place) : ?>
-        <option value=""></option>
+        <option value="">&nbsp;</option>
         <?php foreach ($census_place->allCensusDates() as $census) : ?>
             <option value="<?= $census->censusDate() ?>" data-place="<?= $census->censusPlace() ?>" data-census="<?= get_class($census) ?>">
                 <?= (explode(', ', $census->censusPlace()))[0] ?>