Hotfix

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index a5b9d143aca9830497957aa372a27748d73e764d..12dd105bb298da0153e46a7f2a4cdda4a99bfdf0 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // 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', 'handler') as $lib) {
+foreach (array('request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions', 'revision-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
        // Load special functions
        loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -100,7 +100,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 
                        // Is it a valid resource?
                        if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
-                               // This is required for extension 'optimize' to work
+                               // Set database name (required for ext-optimize and isSqlTableCreated())
                                setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
 
                                // Remove MySQL array from namespace
@@ -110,15 +110,15 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                                loadIncludeOnce('inc/load_cache.php');
                        } else {
                                // Wrong database?
-                               addFatalMessage(__FILE__, __LINE__, '{--WRONG_DB_SELECTED--}');
+                               debug_report_bug(__FILE__, __LINE__, 'Wrong database selected.');
                        }
                } else {
                        // No link to database!
-                       addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
+                       debug_report_bug(__FILE__, __LINE__, 'Database link is not yet up.');
                }
        } else {
                // Maybe you forgot to enter your database login?
-               addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
+               debug_report_bug(__FILE__, __LINE__, 'Database login is missing.');
        }
 } else {
        // Default output is 'direct' for HTML output