X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=837184d15f9cd8667bebb481c4d34c3d9bd7cdd2;hb=cb529a09bd803ae98b5a2fd9baed5a55332252af;hp=7448f7e5ccea9546b5c4ff11d516f364ab1828bf;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 7448f7e5cc..837184d15f 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -469,13 +469,6 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - AFTER<br />");
 	} // END - if
 
-	// Overwrite email from data if present
-	if (isset($content['email'])) $email = $content['email'];
-
-	// Store email for some functions in global $DATA array
-	// @TODO Do only use $content, not $DATA or raw variables
-	$DATA['email'] = $email;
-
 	// Base directory
 	$basePath = sprintf("%stemplates/%s/emails/", getConfig('PATH'), getLanguage());
 
@@ -3133,7 +3126,7 @@ function shutdown () {
 		SQL_CLOSE(__FUNCTION__, __LINE__);
 	} elseif (!isInstallationPhase()) {
 		// No database link
-		addFatalMessage(__FUNCTION__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
+		addFatalMessage(__FUNCTION__, __LINE__, '{--NO_DB_LINK_SHUTDOWN--}');
 	}
 
 	// Stop executing here
@@ -3544,7 +3537,7 @@ function determinePageTitle () {
 		$pageTitle = '{--NO_CONFIG_FOUND_TITLE--}';
 
 		// Do not add the fatal message in installation mode
-		if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FUNCTION__, __LINE__, getMessage('NO_CONFIG_FOUND'));
+		if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FUNCTION__, __LINE__, '{--NO_CONFIG_FOUND--}');
 	}
 
 	// Return title