Selaa lähdekoodia

Convert the card resource to a string if necessary

Apparently the fetched column can be a string or resource. Hence we have
to catch the resource type and convert it to a string.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Christoph Wurst 3 vuotta sitten
vanhempi
commit
cb5bb693de
1 muutettua tiedostoa jossa 6 lisäystä ja 1 poistoa
  1. 6 1
      apps/contactsinteraction/lib/Db/CardSearchDao.php

+ 6 - 1
apps/contactsinteraction/lib/Db/CardSearchDao.php

@@ -28,6 +28,8 @@ namespace OCA\ContactsInteraction\Db;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUser;
+use function is_resource;
+use function stream_get_contents;
 
 class CardSearchDao {
 
@@ -79,12 +81,15 @@ class CardSearchDao {
 			->andWhere($cardQuery->expr()->in('addressbookid', $cardQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
 			->setMaxResults(1);
 		$result = $cardQuery->execute();
-		/** @var string|false $card */
+		/** @var string|resource|false $card */
 		$card = $result->fetchColumn(0);
 
 		if ($card === false) {
 			return null;
 		}
+		if (is_resource($card)) {
+			return stream_get_contents($card);
+		}
 
 		return $card;
 	}