Fix/rewrite

diff --git a/inc/config-global.php b/inc/config-global.php
index 6fba83c71e1bca519f3fd36a07ac674cf5e1405a..7c59f5d1ce7e039e1054bba6652446cc71f6cb98 100644 (file)
--- 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 92103e3663768f480725717e1287343d771f1329..767227bc65ddec21b4273e279d24903658123bfc 100644 (file)
--- 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