X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_config.php;h=541bde300c39863c872ac01d7e031245ef4faff5;hb=834fdeec3dc894c7b6387aa5e65f969fffee1c76;hp=86524a7ce0ec1a2b8561c36e9f1fbd901a914d9b;hpb=6b13c5c64eebedd56683c78d799879e0dc618b21;p=mailer.git diff --git a/inc/load_config.php b/inc/load_config.php index 86524a7ce0..541bde300c 100644 --- a/inc/load_config.php +++ b/inc/load_config.php @@ -16,8 +16,8 @@ * $Author:: $ * * -------------------------------------------------------------------- * * 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 * @@ -81,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('{--MAILER_WARNING--}:'); if (isInstalled()) { @@ -93,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, '
{--MAILER_WARNING--}:
{--WARN_NULL_PASSWORD--}'); + // No database password entered + displayMessage('
{--MAILER_WARNING--}:
{--WARN_NULL_PASSWORD--}'); } // [EOF]