Просмотр исходного кода

Merge pull request #49388 from nextcloud/backport/49332/stable28

[stable28] fix(job): Check if carddata is resource and read it to string
Git'Fellow 17 часов назад
Родитель
Сommit
03300aec8f
1 измененных файлов с 5 добавлено и 1 удалено
  1. 5 1
      apps/dav/lib/Migration/BuildSocialSearchIndexBackgroundJob.php

+ 5 - 1
apps/dav/lib/Migration/BuildSocialSearchIndexBackgroundJob.php

@@ -110,7 +110,11 @@ class BuildSocialSearchIndexBackgroundJob extends QueuedJob {
 		// refresh identified contacts in order to re-index
 		foreach ($social_cards as $contact) {
 			$offset = $contact['id'];
-			$this->davBackend->updateCard($contact['addressbookid'], $contact['uri'], $contact['carddata']);
+			$cardData = $contact['carddata'];
+			if (is_resource($cardData) && (get_resource_type($cardData) === 'stream')) {
+				$cardData = stream_get_contents($cardData);
+			}
+			$this->davBackend->updateCard($contact['addressbookid'], $contact['uri'], $cardData);
 
 			// stop after 15sec (to be continued with next chunk)
 			if (($this->timeFactory->getTime() - $startTime) > 15) {