Same color for admin action links

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 076faa56f2d88f519300a1c722deb7cc1e4eb066..40a86ef8f9ec909cde97e4f04ff6db6abec42b39 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -145,13 +145,16 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        setConfigEntry('_DB_TYPE', 'mysql3');
 
        // Include more
-       foreach (array('inc/db/lib.php','inc/databases.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+       foreach (array('db/lib','databases','session','versions','install-functions','load_config','load_cache') as $inc) {
                // Load the include
-               loadIncludeOnce($inc);
+               loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach
 
-       // Load cache
-       loadIncludeOnce('inc/load_cache.php');
+       // Check wether we are in installation routine
+       if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
+               // Redirect to the URL
+               redirectToUrl('install.php');
+       } // END - if
 }
 
 // Handle fatal errors