X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flanguage-functions.php;h=303fa09d11050b5387fa31ccc9dd63fe5ad60fa8;hb=12dd5b45c50b3837726d9ae81a51f950f843da77;hp=ccf61cb51e3c1cccba7eeaeea909b4772102f8b6;hpb=55b296b02c79cbf1cfce37192bbdaeeee31e6741;p=mailer.git

diff --git a/inc/language-functions.php b/inc/language-functions.php
index ccf61cb51e..303fa09d11 100644
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -108,7 +108,7 @@ function getLanguage () {
 	$ret = 'de';
 
 	// Set default return value to default language from config
-	if (isConfigEntrySet('DEFAULT_LANG')) $ret = getConfig('DEFAULT_LANG');
+	if (isConfigEntrySet('DEFAULT_LANG')) $ret = getDefaultLanguage();
 
 	// Is the variable set
 	if (isGetRequestParameterSet('mx_lang')) {
@@ -122,7 +122,7 @@ function getLanguage () {
 		$ret = getSession('mx_lang');
 
 		// Fixes a warning before the session has the mx_lang constant
-		if (empty($ret)) $ret = getConfig('DEFAULT_LANG');
+		if (empty($ret)) $ret = getDefaultLanguage();
 	}
 
 	// Cache entry
@@ -173,7 +173,7 @@ function loadLanguageFile ($ext_name = 'none') {
 	// Set default language if it is not (yet) set
 	if (is_null($currLanguage)) {
 		// Get it from config
-		$currLanguage = getConfig('DEFAULT_LANG');
+		$currLanguage = getDefaultLanguage();
 
 		// And save it in session
 		setLanguage($currLanguage);
@@ -192,7 +192,7 @@ function loadLanguageFile ($ext_name = 'none') {
 	if (isLanguageIncludeReadable($ext_name)) {
 		// Load language file
 		loadLanguageInclude($ext_name);
-	} elseif ((isDebugModeEnabled()) && (getOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
+	} elseif ((isDebugModeEnabled()) && (getScriptOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
 		// No language file is not so good...
 		logDebugMessage(__FUNCTION__, __LINE__, sprintf("NOTICE: Extension %s has no language file or we cannot read from it. lang=%s, mode=%s",
 			$ext_name,