Workaround for WINDOWS-1252 encoded data :(

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

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index c6d55228b842dc5c4883aead5747f5cf359b086a..19f8a773f5bd22e92419d2a34e11c56bb56722ed 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -116,7 +116,15 @@ function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
 
                // Convert from ISO to UTF-8
                foreach ($response as $k => $v) {
-                       $response[$k] = iconv('ISO-8859-1', 'UTF-8//TRANSLIT',$v);
+                       $response[$k] = iconv('windows-1252', 'UTF-8//TRANSLIT', $v);
+                       /*
+                       // iconv()-less ISO-8859-1 -> UTF-8
+                       $response[$k] = preg_replace(
+                               "/([\x80-\xFF])/e",
+                               "chr(0xC0|ord('\\1')>>6).chr(0x80|ord('\\1')&0x3F)",
+                               $v
+                       );
+                       */
                } // END - if
 
                // Shall we count the query as used?
@@ -221,7 +229,7 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
        $data['categories'] = generateCategoryOptionsList('normal');
 
        // Decode entities
-       $data['text'] = (decodeEntities($data['text']));
+       $data['text'] = decodeEntities($data['text']);
 
        // Load template
        loadTemplate('admin_send_yoomedia', false, $data);
@@ -315,10 +323,7 @@ function translateYooMediaError ($errorCode) {
                $return = $GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode];
        } else {
                // Log missing entries
-               logDebugMessage(__FUNCTION__, __LINE__, "errorCode={$errorCode}");
-               print('<pre>');
-               debug_print_backtrace();
-               die('</pre>');
+               debug_report_bug(sprintf("Unknown error code <strong>%s</strong> detected.", $errorCode));
        }
 
        // Return value