summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2018-11-13 14:26:33 +0100
committerRobin Appelman <robin@icewind.nl>2018-11-13 14:26:33 +0100
commite1a49a223b7db8b5ddf4c549abfdc6ea1b035daa (patch)
treea970a1c9eac0d1bf073fb851cf2ea5789cb5ea9e /lib
parent5e8482483934e1d39703c1568b532fa26724a6c5 (diff)
downloadnextcloud-server-e1a49a223b7db8b5ddf4c549abfdc6ea1b035daa.tar.gz
nextcloud-server-e1a49a223b7db8b5ddf4c549abfdc6ea1b035daa.zip
Fix SetVcardDatabaseUID when using postgresql
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Repair/NC15/SetVcardDatabaseUID.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/Repair/NC15/SetVcardDatabaseUID.php b/lib/private/Repair/NC15/SetVcardDatabaseUID.php
index ccf6c47cbc8..210fc0a862c 100644
--- a/lib/private/Repair/NC15/SetVcardDatabaseUID.php
+++ b/lib/private/Repair/NC15/SetVcardDatabaseUID.php
@@ -112,7 +112,11 @@ class SetVcardDatabaseUID implements IRepairStep {
$count = 0;
foreach ($entries as $entry) {
$count++;
- $uid = $this->getUID($entry['carddata']);
+ $cardData = $entry['carddata'];
+ if (is_resource($cardData)) {
+ $cardData = stream_get_contents($cardData);
+ }
+ $uid = $this->getUID($cardData);
$this->update($entry['id'], $uid);
}
$this->connection->commit();