databases.php is loaded by filter now

diff --git a/inc/databases.php b/inc/databases.php
index 9eb216ce8fcb3ac88c1a1c9303f2cfa21b5aac0c..a3e8c4cb149faf9bb34c16358384703a2cc6236e 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -83,7 +83,7 @@ setConfigEntry('SERVER_URL', 'http://www.mxchange.org');
 
 // Replacement strings
 $GLOBALS['replacer'] = array(
 
 // Replacement strings
 $GLOBALS['replacer'] = array(

-       'userid'  => '%userid%',                // User-ID
+       'userid'  => '%userid%',        // User-ID

        'surname' => '%vorname%',       // Surname
        'family'  => '%nachname%',      // Family name
        'gender'  => '%anrede%',        // Gender
        'surname' => '%vorname%',       // Surname
        'family'  => '%nachname%',      // Family name
        'gender'  => '%anrede%',        // Gender

diff --git a/inc/filters.php b/inc/filters.php
index f64b28f064ca6e480bd9c758930ca6a5e2823e2e..174dad1ad888c2abbceeb43db94aca371a59eda7 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -660,7 +660,7 @@ function FILTER_RUN_DAILY_RESET () {
 // Filter for loading more runtime includes (not for installation)
 function FILTER_LOAD_RUNTIME_INCLUDES () {
        // Load more includes
 // Filter for loading more runtime includes (not for installation)
 function FILTER_LOAD_RUNTIME_INCLUDES () {
        // Load more includes

-       foreach (array('inc/session.php','inc/versions.php') as $inc) {
+       foreach (array('inc/databases.php','inc/session.php','inc/versions.php') as $inc) {

                // Load the include
                loadIncludeOnce($inc);
        } // END - foreach
                // Load the include
                loadIncludeOnce($inc);
        } // END - foreach

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 42b6a887dc41966c7e792983c6961eedb17841f0..f6c1a1f1264f56d8ae6884cbda82cae2c53da8bf 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -109,9 +109,6 @@ if (!isInstalling()) {
                                // Run the init filter chain
                                runFilterChain('init');
 
                                // Run the init filter chain
                                runFilterChain('init');
 

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

                                // Check module for permissions
                                $checkModule = checkModulePermissions();
 
                                // Check module for permissions
                                $checkModule = checkModulePermissions();