X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flanguage-functions.php;h=3d716d966fad60481d27654dbcf188a3c7f5eda8;hb=b679042bd22371aa267e595db8d0e08941afc9eb;hp=ad1d0507ce75b9c459f3e424f4d77fe8ecd59a9b;hpb=2379934be6a196a54f4155bb8e24c49b20736969;p=mailer.git

diff --git a/inc/language-functions.php b/inc/language-functions.php
index ad1d0507ce..3d716d966f 100644
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -96,7 +96,7 @@ function addMessages ($messages) {
 	}
 }
 
-// Checks wether given message id is valid
+// Checks whether given message id is valid
 function isMessageIdValid ($messageId) {
 	return (isset($GLOBALS['messages'][getCurrentLanguage()][$messageId]));
 }
@@ -111,7 +111,7 @@ function setCurrentLanguage ($language) {
 	$GLOBALS['language'] = (string) $language;
 }
 
-// Checks wether current language is set
+// Checks whether current language is set
 function isCurrentLanguageSet () {
 	return (isset($GLOBALS['language']));
 }
@@ -162,7 +162,7 @@ function setLanguage ($lang) {
 	setSession('mailer_lang', $lang);
 }
 
-// Checks wether a language file is there for optional extension
+// Checks whether a language file is there for optional extension
 function isLanguageIncludeReadable ($ext_name = 'none') {
 	// Do we have array element?
 	if (!isset($GLOBALS['lang_inc'][$ext_name])) {
@@ -280,13 +280,13 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
 	// Is one not readable?
 	if (!isIncludeReadable($source)) {
 		// Please report this bug!
-		debug_report_bug(__FUNCTION__, __LINE__, 'Source file ' . $source . ' is not readable.');
+		reportBug(__FUNCTION__, __LINE__, 'Source file ' . $source . ' is not readable.');
 	} elseif (!isIncludeReadable($target)) {
 		// Please report this bug!
-		debug_report_bug(__FUNCTION__, __LINE__, 'Target file ' . $target . ' is not readable.');
+		reportBug(__FUNCTION__, __LINE__, 'Target file ' . $target . ' is not readable.');
 	} elseif ($targetLanguage == getCurrentLanguage()) {
 		// Must be different
-		debug_report_bug(__FUNCTION__, __LINE__, 'Target language ' . $targetLanguage . ' is same as current.');
+		reportBug(__FUNCTION__, __LINE__, 'Target language ' . $targetLanguage . ' is same as current.');
 	}
 
 	// Backup current messages/language
@@ -347,16 +347,16 @@ function getLanguageComparisonDifference ($target) {
 	return $GLOBALS['lang_diff_count'][$target];
 }
 
-// Checks wether the given message is masked
-function isMessageMasked ($messageId) {
+// Checks whether the given message is masked
+function isMessageMasked ($messageId, $strict = true) {
 	// Is the message id valid?
-	if (!isMessageIdValid($messageId)) {
+	if (($strict === true) && (!isMessageIdValid($messageId))) {
 		// No, then abort here
-		debug_report_bug(__FUNCTION__, __LINE__, 'Invalid message id ' . $messageId . ' detected.');
+		reportBug(__FUNCTION__, __LINE__, 'Invalid message id ' . $messageId . ' detected.');
 	} // END - if
 
 	// Now simply check it
-	$masked = isInString('%', $GLOBALS['messages'][getCurrentLanguage()][$messageId]);
+	$masked = isInString('%', getMessage($messageId));
 
 	// Return result
 	return $masked;