extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-24 14:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

using utf-8 encoding for html merge-print

Browse Source
This commit is contained in:
Ralf Becker 2010-08-23 12:04:03 +00:00
parent b2a0d2999d
commit f37e74d560
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etemplate/inc/class.bo_merge.inc.php
View File

@ -472,22 +472,20 @@ abstract class bo_merge
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
case 'application/xml': case 'application/xml':
case 'text/xml': case 'text/xml':
case 'text/html':
$is_xml = true; $is_xml = true;
$charset = 'utf-8'; // xml files --> always use utf-8 $charset = 'utf-8'; // xml files --> always use utf-8
break; break;
case 'text/html':
$is_xml = true;
// fall through
default: // div. text files --> use our export-charset, defined in addressbook prefs default: // div. text files --> use our export-charset, defined in addressbook prefs
$charset = $this->contacts->prefs['csv_charset']; $charset = $this->contacts->prefs['csv_charset'];
break; break;
} }
//error_log(__METHOD__."('$document', ... ,$mimetype) --> $charset (egw=".$GLOBALS['egw']->translation->charset().', export='.$this->contacts->prefs['csv_charset'].')'); //error_log(__METHOD__."('$document', ... ,$mimetype) --> $charset (egw=".translation::charset().', export='.$this->contacts->prefs['csv_charset'].')');
// do we need to convert charset // do we need to convert charset
if ($charset && $charset != $GLOBALS['egw']->translation->charset()) if ($charset && $charset != translation::charset())
{ {
$replacements = $GLOBALS['egw']->translation->convert($replacements,$GLOBALS['egw']->translation->charset(),$charset); $replacements = translation::convert($replacements,translation::charset(),$charset);
} }
if ($is_xml) // zip'ed xml document (eg. OO) if ($is_xml) // zip'ed xml document (eg. OO)
{ {