X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=446518563af4851587ea218b24a246efe7a9b225;hb=0307fb2be4c728bed515c8fe6e25a60a26da3811;hp=836da4cd53fb39a44416fefbb3de087b2a8f6bd4;hpb=00797d46cc0b7e2c4e8c084eb4c6ac26cd0336e1;p=mailer.git diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 836da4cd53..446518563a 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -57,6 +57,9 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'co // Set error handler set_error_handler('__errorHandler'); +// Init request +initRequest(); + // Set important header_sent $GLOBALS['header_sent'] = 0; @@ -68,12 +71,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 +98,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'); @@ -226,8 +229,17 @@ if ((!isInstalling()) && (isInstalled())) { // Load extension 'sql_patches' LOAD_EXTENSION('sql_patches'); + + // Load configuration file(s) here + 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');