X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fload_config.php;h=541bde300c39863c872ac01d7e031245ef4faff5;hp=266eca12cecc70837bf7b13db55ad8505dd7473c;hb=50ec4267016d288831aee809120992423db563e1;hpb=ffe213c8e3f85119ddd5544214d0de9ecb833d98

diff --git a/inc/load_config.php b/inc/load_config.php
index 266eca12ce..541bde300c 100644
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * 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                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -83,8 +81,8 @@ if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadab
 	setConfigEntry('OUTPUT_MODE', 'render');
 }
 
-// Check if the user setups his MySQL stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) {
+// Check if the user setups his database login stuff...
+if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestElementSet('installing')) && (isInstalled())) {
 	// No login entered and outside installation mode
 	outputHtml('<strong>{--MAILER_WARNING--}:</strong>');
 	if (isInstalled()) {
@@ -95,8 +93,8 @@ if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallation
 		debug_report_bug(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}');
 	}
 } elseif ((!isInstalling()) && (!isInstallationPhase()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
-	// No database password entered!!!
-	loadTemplate('admin_settings_saved', false, '<div>{--MAILER_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
+	// No database password entered
+	displayMessage('<div class="warning">{--MAILER_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
 }
 
 // [EOF]