From 30577b677afc52ed8b2e9eea39d5f2f0cb4919f8 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Thu, 17 Nov 2022 11:30:06 +0100
Subject: [PATCH] Set $oVCard->VERSION only once

---
 .../Providers/AddressBook/PdoAddressBook.php         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
index 9a37ee8b2..ae698febb 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
@@ -531,12 +531,16 @@ class PdoAddressBook
 										$sUid = $sFirstName = $sLastName = $sMiddleName = $sSuffix = $sPrefix = '';
 										$iPrevId = $iId;
 									}
-									if (!isset($aVCards[$iId])) {
-										$aVCards[$iId] = new VCard;
+									if (isset($aVCards[$iId])) {
+										$oVCard = $aVCards[$iId];
+									} else {
+										$oVCard = new VCard;
+//										$oVCard = $oVCard->convert(VCard::VCARD40);
+										$oVCard->VERSION = '4.0';
+										$oVCard->PRODID = 'SnappyMail-'.APP_VERSION;
+										$aVCards[$iId] = $oVCard;
 									}
 									$oVCard = $aVCards[$iId];
-									$oVCard->VERSION = '4.0';
-									$oVCard->PRODID = 'SnappyMail-'.APP_VERSION;
 									$sPropValue = (string) $aItem['prop_value'];
 									$aTypes = array();
 									if (!empty($aItem['prop_type_str'])) {