X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flanguage-functions.php;h=db660ff2572c25b69e311492eb0c31ddca7613fb;hb=c529712f8b52273e47c3d6c49af890cb9eb9a3da;hp=5e227601343167b93e1abf8498300bc724e76910;hpb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;p=mailer.git

diff --git a/inc/language-functions.php b/inc/language-functions.php
index 5e22760134..db660ff257 100644
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -63,27 +61,38 @@ function getMessage ($messageId) {
 
 // Getter for message string as a mask
 function getMaskedMessage ($messageId, $data) {
-	return sprintf(getMessage($messageId), $data);
+	// Construct message
+	$message = sprintf(getMessage($messageId), $data);
+
+	// Return it
+	return $message;
 }
 
 // Init messages
 function initMessages () {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getLanguage()=' . getLanguage());
 	$GLOBALS['messages'][getLanguage()] = array();
 }
 
 // Add messages
 function addMessages ($messages) {
+	// Cache current language
+	$currentLanguage = getCurrentLanguage();
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentLanguage=' . $currentLanguage);
+
 	// Merge both
-	$GLOBALS['messages'][getCurrentLanguage()] = merge_array($GLOBALS['messages'][getCurrentLanguage()], $messages);
+	$GLOBALS['messages'][$currentLanguage] = merge_array($GLOBALS['messages'][$currentLanguage], $messages);
 
 	// Don't count them if we don't want it
-	if (isset($GLOBALS['count'])) return;
+	if (isset($GLOBALS['count'])) {
+		return;
+	} // END - if
 
 	// And count them
-	if (isset($GLOBALS['msg_count'][getCurrentLanguage()])) {
-		$GLOBALS['msg_count'][getCurrentLanguage()] += count($messages);
+	if (isset($GLOBALS['msg_count'][$currentLanguage])) {
+		$GLOBALS['msg_count'][$currentLanguage] += count($messages);
 	} else {
-		$GLOBALS['msg_count'][getCurrentLanguage()] = count($messages);
+		$GLOBALS['msg_count'][$currentLanguage] = count($messages);
 	}
 }
 
@@ -192,7 +201,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()) && (isHtmlOutputMode()) && ($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,