extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 23:29:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle problem with mdash and ndash when switching inline signatures, as their utf8 representations fail to convert using utf8_decode

Browse Source
This commit is contained in:
Klaus Leithoff 2012-11-15 16:37:47 +00:00
parent 66a4b635e5
commit fce73d3054
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
felamimail/inc/class.ajaxfelamimail.inc.php
View File

@ -1443,6 +1443,7 @@ class ajaxfelamimail
$signature = $boSignatures->getSignature($_signatureID);
$sigText = $signature->fm_signature;
//error_log(__METHOD__.'Old:'.$oldSigText.'#');
//error_log(__METHOD__.'New:'.$sigText.'#');
if ($_currentMode == 'plain')
{
$oldSigText = utf8_decode($bocompose->convertHTMLToText($oldSigText));
@ -1465,7 +1466,7 @@ class ajaxfelamimail
$_content = str_replace("\n",'\n',$_content); // dont know why, but \n screws up preg_replace
$_content = preg_replace($reg='|'.preg_quote('<!-- HTMLSIGBEGIN -->','|').'.*'.preg_quote('<!-- HTMLSIGEND -->','|').'|u',
$rep='<!-- HTMLSIGBEGIN -->'.$sigText.'<!-- HTMLSIGEND -->', $in=$_content, -1, $replaced);
$_content = str_replace('\n',"\n",$_content);
$_content = str_replace(array('\n',"\xe2\x80\x93","\xe2\x80\x94"),array("\n",'&ndash;','&mdash;'),$_content);
//error_log(__METHOD__."() preg_replace('$reg', '$rep', '$in', -1)='$_content', replaced=$replaced");
if ($replaced)
{