Index: processbounces.php
===================================================================
RCS file: /cvsroot/phplist/phplist/public_html/lists/admin/processbounces.php,v
retrieving revision 1.18
diff -p -8 -u -r1.18 processbounces.php
--- processbounces.php	16 Jan 2008 05:41:28 -0000	1.18
+++ processbounces.php	22 Apr 2008 15:25:28 -0000
@@ -57,17 +57,17 @@ function output ($message,$reset = 0) {
   #print "$infostring $message<br>\n";
   $message = preg_replace("/\n/",'',$message);
   ## contribution from http://forums.phplist.com/viewtopic.php?p=14648
   ## in languages with accented characters replace the HTML back
   //Replace the "&rsquo;" which is not replaced by html_decode
   $message = preg_replace("/&rsquo;/","'",$message); 
   //Decode HTML chars
   #$message = html_entity_decode($message,ENT_QUOTES,$_SESSION['adminlanguage']['charset']);
-  $message = html_entity_decode($message,ENT_QUOTES,'UTF-8');
+  $message = html_entity_decode($message,ENT_QUOTES,$strCharSet);
   if ($GLOBALS["commandline"]) {
     ob_end_clean();
     print strip_tags($message) . "\n";
     ob_start();
   } else {
     if ($reset)
       print '<script language="Javascript" type="text/javascript">
 //        if (document.forms[0].name == "outputform") {
@@ -575,9 +575,9 @@ if ($unsubscribed_users) {
 }
 # shutdown will take care of reporting
 #finish("info",$report);
 
 # IMAP errors following when Notices are on are a PHP bug
 # http://bugs.php.net/bug.php?id=7207
 
 
-?>
\ No newline at end of file
+?>
Index: processqueue.php
===================================================================
RCS file: /cvsroot/phplist/phplist/public_html/lists/admin/processqueue.php,v
retrieving revision 1.34
diff -p -8 -u -r1.34 processqueue.php
--- processqueue.php	31 Mar 2008 14:29:02 -0000	1.34
+++ processqueue.php	22 Apr 2008 15:25:13 -0000
@@ -253,17 +253,17 @@ function output ($message,$logit = 1) {
     $lines = explode("\n",$message);
     foreach ($lines as $line) {
       $line = preg_replace('/"/','\"',$line);
 
       ## contribution in forums, http://forums.phplist.com/viewtopic.php?p=14648
       //Replace the "&rsquo;" which is not replaced by html_decode
       $line = preg_replace("/&rsquo;/","'",$line);
       //Decode HTML chars
-      $line = html_entity_decode($line,ENT_QUOTES,'UTF-8');
+      $line = html_entity_decode($line,ENT_QUOTES,$strCharSet);
       # hmm, language switch form is now in the page as well....
       print '<script language="Javascript" type="text/javascript">
 //        if (document.forms[0].name == "outputform") {
           document.outputform.output.value += "'.$line.'";
           document.outputform.output.value += "\n";
 //        } else
 //          document.writeln("'.$line.'");
       </script>'."\n";