More globals rewritten, see ticket #100

[mailer.git] / inc / libs / yoomedia_functions.php

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 97e3ba3b41e26df8ff4c7d77247addce58c94682..69d4b301f79e44fe70cec8ae52be93d5311a140f 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -262,15 +262,13 @@ function YOOMEDIA_UNLIST_MAIL ($data, $mode) {
 
 // "Translates" the index number into an assosiative value
 function YOOMEDIA_TRANSLATE_INDEX ($type, $index) {
-       global $yoomediaTranslationTable;
-
        // Default is the index
        $return = $index;
 
        // Is the element there?
-       if (isset($yoomediaTranslationTable[$type][$index])) {
+       if (isset($GLOBALS['translation_tables']['yoomedia'][$type][$index])) {
                // Use this element
-               $return = $yoomediaTranslationTable[$type][$index];
+               $return = $GLOBALS['translation_tables']['yoomedia'][$type][$index];
        } else {
                // Not found!
                DEBUG_LOG(__FUNCTION__, __LINE__, " type={$type},index={$index} not found.");
@@ -282,15 +280,13 @@ function YOOMEDIA_TRANSLATE_INDEX ($type, $index) {
 
 // "Translate" error code
 function YOOMEDIA_TRANSLATE_ERROR ($errorCode) {
-       global $yoomediaTranslationTable;
-
        // Default is "failed"
        $return = "failed";
 
        // Is the entry there?
-       if (isset($yoomediaTranslationTable['error_codes'][$errorCode])) {
+       if (isset($GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode])) {
                // Entry found!
-               $return = $yoomediaTranslationTable['error_codes'][$errorCode];
+               $return = $GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode];
        } else {
                // Log missing entries
                DEBUG_LOG(__FUNCTION__, __LINE__, " errorCode={$errorCode}");