X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=0dd8936b1e9bd8815c401b7d267fa7d9fd435c8b;hp=a4e1a8b739d27abd654419b29cc30cdb932b509f;hb=744a2d99cf8759ecd219214bc98f0d32ae038ec1;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index a4e1a8b739..0dd8936b1e 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Load more function libraries or includes
-foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
+foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
 	// Load special functions
 	loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -71,8 +71,8 @@ initFatalMessages();
 // Init message system
 initMessages();
 
-// Check if this file is writeable or read-only and warn the user
-if (!isInstalling()) {
+// Are we in installation phase?
+if ((!isInstalling()) && (!isInstallationPhase())) {
 	// Load configuration file(s) here
 	loadIncludeOnce('inc/load_config.php');
 
@@ -102,12 +102,6 @@ if (!isInstalling()) {
 				// Load cache
 				loadIncludeOnce('inc/load_cache.php');
 
-				// Init filter system
-				initFilterSystem();
-
-				// Run the init filter chain
-				runFilterChain('init');
-
 				// Check module for permissions
 				$checkModule = checkModulePermissions();
 
@@ -159,15 +153,15 @@ if (!isInstalling()) {
 	// Load config
 	loadIncludeOnce('inc/load_config.php');
 
+	// Init filter system here
+	initFilterSystem();
+
 	// Are we installation routine?
 	if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
 		// You have to install first!
 		redirectToUrl('install.php');
 	} // END - if
 
-	// Init filter system here
-	initFilterSystem();
-
 	// Load cache
 	loadIncludeOnce('inc/load_cache.php');