Reverted of changes in 1704, see ticket #160

[mailer.git] / inc / load_config.php

diff --git a/inc/load_config.php b/inc/load_config.php
index 0f277b06e45109a8d524697d5aa935f447062f1b..bd18a92522f35a511197bfacca9678c9a9f5993f 100644 (file)
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -80,13 +81,10 @@ if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncl
 
        // Set output mode here
        setConfigEntry('OUTPUT_MODE', 'render');
-} else {
-       // Redirect to install.php
-       redirectToUrl('install.php');
 }
 
 // Check if the user setups his MySQL stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isGetRequestElementSet('installing')) && (isInstalled())) {
+if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) {
        // No login entered and outside installation mode
        outputHtml('<strong>{--LANG_WARNING--}:</strong>');
        if (isInstalled()) {
@@ -96,7 +94,7 @@ if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isGetRequestEl
                // Please run the installation script (maybe again)
                app_die(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}');
        }
-} elseif ((!isInstalling()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
+} elseif ((!isInstalling()) && (!isInstallationPhase()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
        // No database password entered!!!
        loadTemplate('admin_settings_saved', false, '<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
 }