userid/refid do now allow 'null'

[mailer.git] / inc / language-functions.php

diff --git a/inc/language-functions.php b/inc/language-functions.php
index f1d7f0ac93b385c4135aae61daf3dd9828c61b5e..58a308f09b656dd20f9fa5c8dc7859cb993954f7 100644 (file)
--- 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                    *
@@ -108,7 +106,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 +120,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 +171,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 +190,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,
@@ -257,13 +255,13 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
        // Is one not readable?
        if (!isIncludeReadable($source)) {
                // Please report this bug!
-               debug_report_bug(__FUNCTION__ . ': Source file ' . $source . ' is not readable.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Source file ' . $source . ' is not readable.');
        } elseif (!isIncludeReadable($target)) {
                // Please report this bug!
-               debug_report_bug(__FUNCTION__ . ': Target file ' . $target . ' is not readable.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Target file ' . $target . ' is not readable.');
        } elseif ($targetLanguage == getCurrentLanguage()) {
                // Must be different
-               debug_report_bug(__FUNCTION__ . ': Target language ' . $targetLanguage . ' is same as current.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Target language ' . $targetLanguage . ' is same as current.');
        }
 
        // Backup current messages/language
@@ -329,7 +327,7 @@ function isMessageMasked ($messageId) {
        // Is the message id valid?
        if (!isMessageIdValid($messageId)) {
                // No, then abort here
-               debug_report_bug(__FUNCTION__ . ': Invalid message id ' . $messageId . ' detected.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Invalid message id ' . $messageId . ' detected.');
        } // END - if
 
        // Now simply check it