New extension added, ext-uberwach rewritten (unfinished), some fixes

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 42b6a887dc41966c7e792983c6961eedb17841f0..11ed8a13e4e5e58c2af4f47abd1ceae91a0ec957 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -70,16 +70,12 @@ initMessages();
 
 // Check if this file is writeable or read-only and warn the user
 if (!isInstalling()) {
-       // Load database layer here
-       loadIncludeOnce('inc/db/lib.php');
-
-       // Set missing module
-       if ((!isModuleSet()) && (isGetRequestElementSet('module'))) setModule(getRequestElement('module'));
-       if (!isModuleSet()) setModule('index');
-
        // Load configuration file(s) here
        loadIncludeOnce('inc/load_config.php');
 
+       // Load database layer here
+       loadIncludeOnce('inc/db/lib.php');
+
        // CSS array
        initExtensionCssFiles();
 
@@ -109,9 +105,6 @@ if (!isInstalling()) {
                                // Run the init filter chain
                                runFilterChain('init');
 
-                               // Load "databases" aka static arrays
-                               loadIncludeOnce('inc/databases.php');
-
                                // Check module for permissions
                                $checkModule = checkModulePermissions();
 
@@ -151,9 +144,6 @@ if (!isInstalling()) {
                setConfigEntry('OUTPUT_MODE', 'render');
        } // END - if
 
-       // Set other missing variables
-       if (!isOutputModeSet()) setOutputMode(0);
-
        // Include more
        foreach (array('inc/databases.php','inc/versions.php','inc/db/lib.php','inc/session.php','inc/install-functions.php','inc/load_config.php') as $inc) {
                // Load the include