X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_config.php;h=541bde300c39863c872ac01d7e031245ef4faff5;hb=7957bf99511c45f993cdad1304ade6700385fef8;hp=e0c3ad0ee5c800f7655badcead1061432cff2172;hpb=5d89789720c77e954b2eba28c00ec710dd28900d;p=mailer.git diff --git a/inc/load_config.php b/inc/load_config.php index e0c3ad0ee5..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 * @@ -82,7 +82,7 @@ if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadab } // Check if the user setups his database login stuff... -if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) { +if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestElementSet('installing')) && (isInstalled())) { // No login entered and outside installation mode outputHtml('{--MAILER_WARNING--}:'); if (isInstalled()) { @@ -94,7 +94,7 @@ if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallation } } 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--}'); + displayMessage('
{--MAILER_WARNING--}:
{--WARN_NULL_PASSWORD--}'); } // [EOF]