From 2e482fdc2acb18d9cdaba03c5724e74d76a1c240 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Thu, 1 Feb 2024 18:36:23 +0100
Subject: [PATCH] Relocation of myaac tables check
Makes more sense, between $db connection and migrate.php
---
admin/index.php | 5 -----
index.php | 5 -----
system/init.php | 5 +++++
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/admin/index.php b/admin/index.php
index 3d7fc2a8..15ab133c 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -25,11 +25,6 @@ define('PAGE', $page);
require SYSTEM . 'functions.php';
require SYSTEM . 'init.php';
-// verify myaac tables exists in database
-if(!$db->hasTable('myaac_account_actions')) {
- throw new RuntimeException('Seems that the table <strong>myaac_account_actions</strong> of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting <a href="' . BASE_URL . 'install">this</a> url.');
-}
-
require __DIR__ . '/includes/debugbar.php';
require SYSTEM . 'status.php';
require SYSTEM . 'login.php';
diff --git a/index.php b/index.php
index 9eb2601e..c8c65419 100644
--- a/index.php
+++ b/index.php
@@ -69,11 +69,6 @@ $template_place_holders = array();
require_once SYSTEM . 'init.php';
-// verify myaac tables exists in database
-if(!$db->hasTable('myaac_account_actions')) {
- throw new RuntimeException('Seems that the table <strong>myaac_account_actions</strong> of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting <a href="' . BASE_URL . 'install">this</a> url.');
-}
-
require_once SYSTEM . 'template.php';
require_once SYSTEM . 'login.php';
require_once SYSTEM . 'status.php';
diff --git a/system/init.php b/system/init.php
index 8ff47583..50c79862 100644
--- a/system/init.php
+++ b/system/init.php
@@ -134,6 +134,11 @@ $ots = POT::getInstance();
$eloquentConnection = null;
require_once SYSTEM . 'database.php';
+// verify myaac tables exists in database
+if(!$db->hasTable('myaac_account_actions')) {
+ throw new RuntimeException('Seems that the table myaac_account_actions of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting <a href="' . BASE_URL . 'install">this</a> url.');
+}
+
// execute migrations
require SYSTEM . 'migrate.php';