From 8a390466e9c8a51da66bcbc08462d5871665a8c4 Mon Sep 17 00:00:00 2001
From: Sam Reed <sam@reedyboy.net>
Date: Thu, 27 Jul 2023 00:23:43 +0100
Subject: [PATCH] settings: Fix loading of sidebar

---
 html/settings.php | 5 +++--
 index.php         | 2 +-
 sidebar.php       | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/html/settings.php b/html/settings.php
index 9e4deb5c..3a257357 100644
--- a/html/settings.php
+++ b/html/settings.php
@@ -308,8 +308,9 @@
     </div>
 
     <div id="sideBar">
-<?php include '../sidebar.php';
-include 'ad-sidebar.html';
+<?php
+include_once '../sidebar.php';
+include_once 'ad-sidebar.html';
 ?>
     </div>
 
diff --git a/index.php b/index.php
index a083a02f..b3d2698a 100644
--- a/index.php
+++ b/index.php
@@ -74,7 +74,7 @@
     </div>
 
   <div id="sideBar">
-    <?php include "./sidebar.php"; ?>
+    <?php include_once "./sidebar.php"; ?>
     <div id="login">
       <div id="langselect" style="display: block; text-align: right; margin-bottom: 10px">
         <?php locale_pulldown($dbh, $locale); ?>
diff --git a/sidebar.php b/sidebar.php
index f349ad09..62fa58af 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -1,7 +1,5 @@
 <?php
-require_once "./php/locale.php";
 ?>
-
 <center>
     <a href="/"><img src="/img/openflights-logo.png" alt="<?php echo _('OpenFlights logo'); ?>" width="220" height="31" style="margin: 10px 10px 0px 10px"/></a><br>
     <h6>