X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_config.php;h=2a59160ec13213d70ed5e5adc00c9d6d122f8cf8;hb=3113acaff1e9a7ec42efc4d2cf3a28321b353737;hp=b6fe037af48c0b17fbec4c1a6df679e952888a52;hpb=2ee07f62fa9c008a56afec6cad94e132454d8596;p=mailer.git diff --git a/inc/load_config.php b/inc/load_config.php index b6fe037af4..2a59160ec1 100644 --- 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 * @@ -52,7 +53,7 @@ $GLOBALS['config_local_loaded'] = false; // Is the local configuration there? if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) { // We are better in installation mode - $GLOBALS['mxchange_installing'] = true; + $GLOBALS['mailer_installing'] = true; // Define default main_title here setConfigEntry('MAIN_TITLE', 'Your mail-exchange title'); @@ -83,7 +84,7 @@ if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncl } // Check if the user setups his MySQL stuff... -if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestElementSet('installing')) && (isInstalled())) { +if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) { // No login entered and outside installation mode outputHtml('{--LANG_WARNING--}:'); if (isInstalled()) {