From cefaabcb0dd3c10223543ba8170bf8f700bf6ec9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 26 Jul 2009 12:47:47 +0000 Subject: [PATCH] Still a bit silly but seems to work --- inc/mysql-connect.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 20d19f4b36..7bf73db0fb 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -68,12 +68,6 @@ if ((!isInstalling()) && (isInstalled())) { // Load "databases" aka static arrays loadIncludeOnce('inc/databases.php'); - // Init session - loadIncludeOnce('inc/session.php'); - - // Load versions - loadIncludeOnce('inc/versions.php'); - // Load configuration file(s) here loadIncludeOnce('inc/load_config.php'); @@ -101,6 +95,12 @@ if ((!isInstalling()) && (isInstalled())) { // Load configuration stuff loadConfiguration(); + // Init session + loadIncludeOnce('inc/session.php'); + + // Load versions + loadIncludeOnce('inc/versions.php'); + // Loading patching system is required here... loadIncludeOnce('inc/patch-system.php'); @@ -231,6 +231,12 @@ if ((!isInstalling()) && (isInstalled())) { loadIncludeOnce('inc/load_config.php'); } +// Init session +loadIncludeOnce('inc/session.php'); + +// Load versions +loadIncludeOnce('inc/versions.php'); + if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != '1')) { // One or more fatal error(s) occur during connect... loadIncludeOnce('inc/header.php'); -- 2.39.5