Old config.php is now automatically updated to new config-local.php format, several...

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index f4e1d42d3a81aaec36f3cb735d57b32964f77b14..0fe09b27dcc09db9466e64e8a8094d51403189a1 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -49,7 +49,7 @@ require('inc/functions.php');
 require('inc/wrapper-functions.php');
 
 // Load more function libraries or includes
 require('inc/wrapper-functions.php');
 
 // Load more function libraries or includes

-foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'language-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {

        // Load special functions
        loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
        // Load special functions
        loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach


@@ -65,6 +65,15 @@ initFatalMessages();
 
 // Check if this file is writeable or read-only and warn the user
 if ((!isInstalling()) && (isInstalled())) {
 
 // Check if this file is writeable or read-only and warn the user
 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');
 
        // Load configuration file(s) here
        loadIncludeOnce('inc/load_config.php');
 


@@ -92,15 +101,6 @@ if ((!isInstalling()) && (isInstalled())) {
                                // Load configuration stuff
                                loadConfiguration();
 
                                // Load configuration stuff
                                loadConfiguration();
 

-                               // Load "databases" aka static arrays
-                               loadIncludeOnce('inc/databases.php');
-
-                               // Init session
-                               loadIncludeOnce('inc/session.php');
-
-                               // Load versions
-                               loadIncludeOnce('inc/versions.php');
-

                                // Loading patching system is required here...
                                loadIncludeOnce('inc/patch-system.php');
 
                                // Loading patching system is required here...
                                loadIncludeOnce('inc/patch-system.php');
 


@@ -180,6 +180,12 @@ if ((!isInstalling()) && (isInstalled())) {
        // Include neccessary functions for installation //
        ///////////////////////////////////////////////////
 
        // Include neccessary functions for installation //
        ///////////////////////////////////////////////////
 

+       // This hack prevents a backtrace in CSS output
+       if ($GLOBALS['output_mode'] == '1') {
+               // Problem with config so set output mode
+               setConfigEntry('OUTPUT_MODE', 'render');
+       } // END - if
+

        // Set other missing variables
        if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = '0';
 
        // Set other missing variables
        if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = '0';