X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flanguage-functions.php;h=906a78dc9766992f0e657e99b3ed492c05416464;hb=2eb01731e9a7a21c1b44ca5881a1444a801f5e5a;hp=1936842e75f3d78e1fcc06993408753e1092fbc2;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df;p=mailer.git

diff --git a/inc/language-functions.php b/inc/language-functions.php
index 1936842e75..906a78dc97 100644
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/25/2003 *
- * ===============                              Last change: 11/29/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 08/25/2003 *
+ * ===================                          Last change: 11/29/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : language-functions.php                           *
@@ -83,8 +83,11 @@ function getCurrentLanguage () {
 
 // "Getter" for language
 function getLanguage () {
+	// Default is 'de'. DO NOT CHANGE THIS!!!
+	$ret = 'de';
+
 	// Set default return value to default language from config
-	$ret = getConfig('DEFAULT_LANG');
+	if (isConfigEntrySet('DEFAULT_LANG')) $ret = getConfig('DEFAULT_LANG');
 
 	// Init variable
 	$lang = '';
@@ -119,8 +122,8 @@ function getLanguage () {
 
 // "Setter" for language
 function setLanguage ($lang) {
-	// Accept only first 2 chars!
-	$lang = substr(SQL_ESCAPE(secureString($lang)), 0, 2);
+	// Accept only first 2 chars and still secure them
+	$lang = substr(secureString($lang), 0, 2);
 
 	// Set cookie
 	setSession('mx_lang', $lang);
@@ -177,7 +180,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()) && (getOutputMode() == '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,