From: Roland Häder <roland@mxchange.org>
Date: Sat, 29 Sep 2012 13:00:05 +0000 (+0000)
Subject: Fix/rewrite
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a47049ea6f00de14e0c87c1b78b035cc713a1f09;p=mailer.git

Fix/rewrite
---

diff --git a/inc/config-global.php b/inc/config-global.php
index 6fba83c71e..7c59f5d1ce 100644
--- a/inc/config-global.php
+++ b/inc/config-global.php
@@ -63,7 +63,7 @@ if (function_exists('import_request_variables')) {
 $path = str_replace(chr(92), '/', substr(dirname(__FILE__), 0, -3));
 
 // Some very important function includes
-foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'stats', 'http', 'xml', 'callback', 'referral', 'email') as $inc) {
+foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'http') as $inc) {
 	include($path . 'inc/' . $inc . '-functions.php');
 } // END - foreach
 
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 92103e3663..767227bc65 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -40,8 +40,28 @@ if (!defined('__SECURITY')) {
 	die();
 } // END - if
 
+// Init include file array as it follows same naming scheme
+foreach ( array(
+		'stats',
+		'xml',
+		'callback',
+		'referral',
+		'email',
+		'request',
+		'session',
+		'code',
+		'language',
+		'sql',
+		'expression',
+		'filter',
+		'revision',
+		'extensions') as $lib) {
+	// Load special functions
+	loadIncludeOnce('inc/' . $lib . '-functions.php');
+} // END - foreach
+
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions', 'revision-functions', 'filters', 'mysql-manager', 'extensions-functions', 'email-functions', 'handler') as $lib) {
+foreach (array('filters', 'mysql-manager', 'handler') as $lib) {
 	// Load special functions
 	loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach