A lot calls saved, expression language rewritten:

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

diff --git a/inc/language-functions.php b/inc/language-functions.php
index ccf61cb51e3c1cccba7eeaeea909b4772102f8b6..5e227601343167b93e1abf8498300bc724e76910 100644 (file)
--- 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);