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

use vcard_charset preference for generating vcards for addressbook

Browse Source
This commit is contained in:
Ralf Becker 2016-04-29 08:52:28 +00:00
parent 1bf2ab4016
commit b86a5d469c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Vfs/Links/StreamWrapper.php
View File

@ -286,7 +286,11 @@ class StreamWrapper extends LinksParent
{ {
list($id) = array_slice(explode('/',$url),-2,1); list($id) = array_slice(explode('/',$url),-2,1);
$ab_vcard = new addressbook_vcal('addressbook','text/vcard'); $ab_vcard = new addressbook_vcal('addressbook','text/vcard');
if (!($vcard =& $ab_vcard->getVCard($id))) if (!($charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset']))
{
$charset = 'utf-8';
}
if (!($vcard =& $ab_vcard->getVCard($id, $charset)))
{ {
error_log(__METHOD__."('$url', '$mode', $options) addressbook_vcal::getVCard($id) returned false!"); error_log(__METHOD__."('$url', '$mode', $options) addressbook_vcal::getVCard($id) returned false!");
return false; return false;