Heacy rewrite/cleanup:

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index b79794bea0a486c1d1a9e5cfa2d364c17d849188..5cd6a3cf45277990ba93d498c8da49ef1fe61e85 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -104,7 +104,7 @@ initRepositoryData();
 enableTemplateHtml();
 
 // Are we in installation phase?
 enableTemplateHtml();
 
 // Are we in installation phase?

-if ((!isInstalling()) && (!isInstallationPhase())) {
+if ((!isInstaller()) && (isInstalled())) {

        // Load configuration file(s) here
        loadIncludeOnce('inc/load_config.php');
 
        // Load configuration file(s) here
        loadIncludeOnce('inc/load_config.php');
 


@@ -143,7 +143,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 
        // Include more
        foreach (array('databases', 'session', 'versions', 'install-functions', 'load_config', 'load_cache') as $inc) {
 
        // 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
 
                loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach