GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Avoid potentially double encoding already utf-8 encoded messages

Browse Source
This commit is contained in:
Craig Andrews 2009-07-28 22:47:32 -04:00
parent 5aa303320b
commit f3352254b7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/maildaemon.php
View File

@ -301,7 +301,7 @@ class MailerDaemon
$this->extract_part($parsed,$msg,$attachments); $this->extract_part($parsed,$msg,$attachments);
return array($from, $to, utf8_encode($msg), $attachments); return array($from, $to, $msg, $attachments);
} }
function extract_part($parsed,&$msg,&$attachments){ function extract_part($parsed,&$msg,&$attachments){
@ -317,6 +317,9 @@ class MailerDaemon
} else if ($parsed->ctype_primary == 'text' } else if ($parsed->ctype_primary == 'text'
&& $parsed->ctype_secondary=='plain') { && $parsed->ctype_secondary=='plain') {
$msg = $parsed->body; $msg = $parsed->body;
if(strtolower($parsed->ctype_parameters['charset']) != "utf-8"){
$msg = utf8_encode($msg);
}
}else if(!empty($parsed->body)){ }else if(!empty($parsed->body)){
if(common_config('attachments', 'uploads')){ if(common_config('attachments', 'uploads')){
//only save attachments if uploads are enabled //only save attachments if uploads are enabled