Installation phase fixed (even more):

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 92103e3663768f480725717e1287343d771f1329..defaaeba0dc67b48953e6435b3e6f72e95bc0d9b 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
@@ -100,7 +120,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 
                        // Is it a valid resource?
                        if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
-                               // Set database name (required for ext-optimize and isSqlTableCreated())
+                               // Set database name (required for ext-optimize and ifSqlTableExists())
                                setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
 
                                // Remove MySQL array from namespace