From: Roland Häder <roland@mxchange.org>
Date: Fri, 30 Oct 2009 09:43:32 +0000 (+0000)
Subject: databases.php is loaded by filter now
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8dc09e2333cff56caa7719bf1089d068cd21b7c3;p=mailer.git

databases.php is loaded by filter now
---

diff --git a/inc/databases.php b/inc/databases.php
index 9eb216ce8f..a3e8c4cb14 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -83,7 +83,7 @@ setConfigEntry('SERVER_URL', 'http://www.mxchange.org');
 
 // Replacement strings
 $GLOBALS['replacer'] = array(
-	'userid'  => '%userid%',		// User-ID
+	'userid'  => '%userid%',	// User-ID
 	'surname' => '%vorname%',	// Surname
 	'family'  => '%nachname%',	// Family name
 	'gender'  => '%anrede%',	// Gender
diff --git a/inc/filters.php b/inc/filters.php
index f64b28f064..174dad1ad8 100644
--- 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
-	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
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 42b6a887dc..f6c1a1f126 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -109,9 +109,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();