mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24114 from nextcloud/backport/24096/stable20 

[stable20] Convert the card resource to a string if necessary
This commit is contained in:
John Molakvoæ 2020-11-16 10:15:18 +01:00 committed by GitHub
parent d334dd1455 07861fe52d
commit 18f5ad1a34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/contactsinteraction/lib/Db/CardSearchDao.php
View File

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