D5226.1775248985.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D5226.1775248985.diff
View Options

	diff --git a/lib/ext/Syncroton/Model/AXMLEntry.php b/lib/ext/Syncroton/Model/AXMLEntry.php
	--- a/lib/ext/Syncroton/Model/AXMLEntry.php
	+++ b/lib/ext/Syncroton/Model/AXMLEntry.php
	@@ -50,7 +50,7 @@

	foreach ($this->_elements as $elementName => $value) {
	// skip empty values
	- if ($value === null \|\| $value === '' \|\| (is_array($value) && empty($value))) {
	+ if ($value === null \|\| (is_array($value) && empty($value))) {
	continue;
	}

	diff --git a/lib/kolab_sync_data_contacts.php b/lib/kolab_sync_data_contacts.php
	--- a/lib/kolab_sync_data_contacts.php
	+++ b/lib/kolab_sync_data_contacts.php
	@@ -201,6 +201,12 @@
	}
	}

	+ // Outlook's synchronization will break with an empty contact (no nodes under ApplicationData),
	+ // so we make sure to always set a property (an empty name is enough as long as there is an XML node).
	+ if (empty($result)) {
	+ $result['firstName'] = '';
	+ }
	+
	return new Syncroton_Model_Contact($result);
	}