From c0f812baeb6392ab46c815bd3616cdb1a7617148 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Tue, 11 Oct 2022 14:59:17 +0100
Subject: [PATCH] Hopefully now works correctly

---
 application/controllers/Dashboard.php | 4 ++++
 application/controllers/Welcome.php   | 2 +-
 application/libraries/OptionsLib.php  | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index 22d35f11..a5b2d896 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -13,6 +13,10 @@ class Dashboard extends CI_Controller {
 		$this->load->model('logbook_model');
 		$this->load->model('user_model');
 
+		if($this->optionslib->get_option('version2_trigger') == "false") {
+			redirect('welcome');
+		}
+
 		// Check if users logged in
 
 		if($this->user_model->validate_session() == 0) {
diff --git a/application/controllers/Welcome.php b/application/controllers/Welcome.php
index 7435c897..bea2f551 100644
--- a/application/controllers/Welcome.php
+++ b/application/controllers/Welcome.php
@@ -39,7 +39,7 @@ class Welcome extends CI_Controller {
                 $this->load->view('interface_assets/footer');
             } else {
                 $data['NoMigrationRequired'] = false;
-                $this->optionslib->update('version2_trigger', "true");
+                $this->optionslib->update('version2_trigger', "true", "yes");
                 redirect('dashboard');
             }
         } else {
diff --git a/application/libraries/OptionsLib.php b/application/libraries/OptionsLib.php
index eb576150..c595bbb3 100644
--- a/application/libraries/OptionsLib.php
+++ b/application/libraries/OptionsLib.php
@@ -37,7 +37,6 @@ class OptionsLib {
                 } else {
                     $CI->config->set_item('option_'.$item->option_name, $item->option_value);
                 }
-
             }
         }
     }