Some lost old templates rewritten to expression language

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

diff --git a/inc/language-functions.php b/inc/language-functions.php
index 0de23e3d2dbc86bc7b4da838ec8760302300aef3..d0dd156a6ee0a3468b5c452c2d0354b3d304ac65 100644 (file)
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -60,6 +60,11 @@ function getMessage ($messageId) {
        return $return;
 }
 
+// Getter for message string as a mask
+function getMaskedMessage ($messageId, $data) {
+       return sprintf(getMessage($messageId), $data);
+}
+
 // Init messages
 function initMessages () {
        $GLOBALS['messages'][getLanguage()] = array();
@@ -105,9 +110,9 @@ function getLanguage () {
        if (isConfigEntrySet('DEFAULT_LANG')) $ret = getConfig('DEFAULT_LANG');
 
        // Is the variable set
-       if (isGetRequestElementSet('mx_lang')) {
+       if (isGetRequestParameterSet('mx_lang')) {
                // Accept only first 2 chars
-               $ret = substr(getRequestElement('mx_lang'), 0, 2);
+               $ret = substr(getRequestParameter('mx_lang'), 0, 2);
        } elseif (isset($GLOBALS['language'])) {
                // Use cached
                $ret = getCurrentLanguage();