Merge pull request #2663 from WPO-Foundation/display_errors_3

Lighthouse start page notice cleanup
catchpoint · Jan 26, 2023 · f3551d0 · f3551d0
2 parents ff98065 + fe1407c
commit f3551d0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/www/lighthouse_test.php b/www/lighthouse_test.php
@@ -19,12 +19,13 @@
 if (isset($req_url)) {
     $url = htmlspecialchars($req_url);
 }
-    $placeholder = 'Enter a website URL...';
+$placeholder = 'Enter a website URL...';
+$lighthouse = [];
 if (file_exists('./settings/server/lighthouse.ini')) {
     $lighthouse = parse_ini_file('./settings/server/lighthouse.ini', true);
 } elseif (file_exists('./settings/common/lighthouse.ini')) {
     $lighthouse = parse_ini_file('./settings/common/lighthouse.ini', true);
-} else {
+} elseif (file_exists('./settings/lighthouse.ini')) {
     $lighthouse = parse_ini_file('./settings/lighthouse.ini', true);
 }
 ?>
@@ -97,7 +98,7 @@
                                 <label for="location">Test Location:</label>
                                   <select name="location" id="location" onchange="profileChanged()">
                                   <?php
-                                    if (isset($lighthouse) && is_array($lighthouse) && isset($lighthouse['locations']) && count($lighthouse['locations'])) {
+                                    if (!empty($lighthouse['locations'])) {
                                         foreach ($lighthouse['locations'] as $id => $label) {
                                             $selected = '';
                                             if ($id === $_COOKIE['lhloc']) {