[eGroupWare-svn] r55931 - in /trunk/egroupware/api: ./ src/Vfs/Links/StreamWrapper.php

Author: ralfbecker
Date: Fri Apr 29 10:52:28 2016
New Revision: 55931

URL: http://svn.stylite.de/viewvc/egroupware?rev=55931&view=rev
Log:
use vcard_charset preference for generating vcards for addressbook

Modified:
    trunk/egroupware/api/   (props changed)
    trunk/egroupware/api/src/Vfs/Links/StreamWrapper.php

Propchange: trunk/egroupware/api/
------------------------------------------------------------------------------
    svn:mergeinfo = /branches/14.2/egroupware/api:55930

Modified: trunk/egroupware/api/src/Vfs/Links/StreamWrapper.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Vfs/Links/StreamWrapper.php?rev=55931&r1=55930&r2=55931&view=diff
==============================================================================
--- trunk/egroupware/api/src/Vfs/Links/StreamWrapper.php (original)
+++ trunk/egroupware/api/src/Vfs/Links/StreamWrapper.php Fri Apr 29 10:52:28 2016
@@ -286,7 +286,11 @@
 		{
 			list($id) = array_slice(explode('/',$url),-2,1);
 			$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!");
 				return false;


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z