Author: ralfbecker
Date: Wed Apr 27 16:47:16 2016
New Revision: 55889
URL: http://svn.stylite.de/viewvc/egroupware?rev=55889&view=rev
Log:
* CardDAV: SoGo and Busycontacts without all name- or organisation components use last value for missing ones
eg. "N:Lastname;Firstname" would also set middle-name, prefix and sufix with "Firstname", same with "ORG:Organisation" would set department and position with "Organisation"
Modified:
branches/14.2/addressbook/ (props changed)
branches/14.2/addressbook/inc/class.addressbook_vcal.inc.php
Propchange: branches/14.2/addressbook/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 16:47:16 2016
@@ -1,1 +1,1 @@
-/trunk/addressbook:51376,51455,51563-51564,51566,51568,51584,51768,51812,51817,51953,51980,52009,52042,52174,52292,52351,52362,52420,52425,52453,52504,52511,52546,52613,52633,52817,52837,52898,52903,52971-52973,52983-52988,53006,53156,53163,53196,53209,53245,53413,53427,53491,53580,53607,53623,53639,53678,53684,53708-53709,53733,53749,53863,53964,54010,54293,54373,54557,54560,54578,54710,54782,54795-54797,54856,55560,55884
+/trunk/addressbook:51376,51455,51563-51564,51566,51568,51584,51768,51812,51817,51953,51980,52009,52042,52174,52292,52351,52362,52420,52425,52453,52504,52511,52546,52613,52633,52817,52837,52898,52903,52971-52973,52983-52988,53006,53156,53163,53196,53209,53245,53413,53427,53491,53580,53607,53623,53639,53678,53684,53708-53709,53733,53749,53863,53964,54010,54293,54373,54557,54560,54578,54710,54782,54795-54797,54856,55560,55884,55888
Modified: branches/14.2/addressbook/inc/class.addressbook_vcal.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/addressbook/inc/class.addressbook_vcal.inc.php?rev=55889&r1=55888&r2=55889&view=diff
==============================================================================
--- branches/14.2/addressbook/inc/class.addressbook_vcal.inc.php (original)
+++ branches/14.2/addressbook/inc/class.addressbook_vcal.inc.php Wed Apr 27 16:47:16 2016
@@ -929,10 +929,8 @@
{
if (!empty($fieldName))
{
- if (is_scalar($vcardValues[$vcardKey]['values'][$fieldKey]))
- {
- $value = trim($vcardValues[$vcardKey]['values'][$fieldKey]);
- }
+ $value = trim($vcardValues[$vcardKey]['values'][$fieldKey]);
+
if ($pref_tel && (($vcardKey == $pref_tel) ||
($vcardValues[$vcardKey]['name'] == 'TEL') &&
($vcardValues[$vcardKey]['value'] == $vcardValues[$pref_tel]['value'])))
------------------------------------------------------------------------------
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
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.