Fixed bug 'sprintf() too few arguments':

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index f94fdb8b409ce12ff6d7ac1aa687947ab4eb2476..5cd6a3cf45277990ba93d498c8da49ef1fe61e85 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,6 +53,7 @@ foreach ( array(
                'request',
                'session',
                'code',
+               'pool',
                'language',
                'sql',
                'expression',
@@ -61,7 +62,7 @@ foreach ( array(
                'extensions') as $lib) {
 
        // Add it
-       $__functions[] = $lib . '-functions';
+       array_push($__functions, $lib . '-functions');
 } // END - foreach
 
 // Load more function libraries or includes
@@ -103,7 +104,7 @@ initRepositoryData();
 enableTemplateHtml();
 
 // Are we in installation phase?
-if ((!isInstalling()) && (!isInstallationPhase())) {
+if ((!isInstaller()) && (isInstalled())) {
        // Load configuration file(s) here
        loadIncludeOnce('inc/load_config.php');
 
@@ -131,6 +132,9 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // CFG: DATABASE-TYPE
        setConfigEntry('_DB_TYPE', 'mysql3');
 
+       // Set link as down
+       unsetSqlLinkUp(__FILE__, __LINE__);
+
        // Load database layer here
        loadIncludeOnce('inc/db/lib.php');
 
@@ -139,7 +143,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 
        // Include more
        foreach (array('databases', 'session', 'versions', 'install-functions', 'load_config', 'load_cache') as $inc) {
-               // Load the include
+               // Load include file
                loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach