summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-11-16 12:15:15 +0100
committerGitHub <noreply@github.com>2020-11-16 12:15:15 +0100
commit20b30250229e7ecfe241ff7ba8ec222cb835c201 (patch)
tree8c36bf38d8db3d00e3af4116bac95767a70decd8
parentcf04049aa667937b46be58580128353dafb5ffa9 (diff)
parenta4f6ceb8628cd24acfb99e482132c6d4fb387823 (diff)
downloadnextcloud-server-20b30250229e7ecfe241ff7ba8ec222cb835c201.tar.gz
nextcloud-server-20b30250229e7ecfe241ff7ba8ec222cb835c201.zip
Merge pull request #24115 from nextcloud/backport/24096/stable19
[stable19] Convert the card resource to a string if necessary
-rw-r--r--apps/contactsinteraction/lib/Db/CardSearchDao.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/contactsinteraction/lib/Db/CardSearchDao.php b/apps/contactsinteraction/lib/Db/CardSearchDao.php
index 391dca60fab..0636829272b 100644
--- a/apps/contactsinteraction/lib/Db/CardSearchDao.php
+++ b/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;
}