Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/polls.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordartcafe <github@dartcafe.de>2020-09-14 02:17:38 +0300
committerdartcafe <github@dartcafe.de>2020-09-14 02:17:38 +0300
commit348f41e38fc52e7e16df0f75ee76da8fd0503efd (patch)
treee84f5198a7108a466aec60bf9d5973a6fdc1d41b
parentab99e4c1abbb31b50a54e6a7be837afa2b604ae2 (diff)
minor fixes
-rw-r--r--lib/Model/Acl.php3
-rw-r--r--lib/Service/PollService.php1
-rw-r--r--lib/Service/SystemService.php4
3 files changed, 3 insertions, 5 deletions
diff --git a/lib/Model/Acl.php b/lib/Model/Acl.php
index 12693dc7..e2cb43ee 100644
--- a/lib/Model/Acl.php
+++ b/lib/Model/Acl.php
@@ -46,9 +46,6 @@ class Acl implements JsonSerializable {
/** @var int */
private $pollId = 0;
- /** @var array */
- private $shares = [];
-
/** @var string */
private $token = '';
diff --git a/lib/Service/PollService.php b/lib/Service/PollService.php
index c75163db..fc459587 100644
--- a/lib/Service/PollService.php
+++ b/lib/Service/PollService.php
@@ -318,6 +318,7 @@ class PollService {
}
$votes = $this->voteMapper->findParticipantsByPoll($pollId);
+ $list = [];
foreach ($votes as $vote) {
$list[] = $vote->getDisplayName() . ' <' . $this->mailService->resolveEmailAddress($pollId, $vote->getUserId()) . '>';
}
diff --git a/lib/Service/SystemService.php b/lib/Service/SystemService.php
index e52dafa9..1d4b731e 100644
--- a/lib/Service/SystemService.php
+++ b/lib/Service/SystemService.php
@@ -317,11 +317,11 @@ class SystemService {
if (\OC::$server->getContactsManager()->isEnabled()) {
if ($getContacts) {
- $list = array_merge($list, $this->getContacts($query, $skipUsers));
+ $list = array_merge($list, $this->getContacts($query));
}
if ($getContacts) {
- $list = array_merge($list, $this->getContactsGroups($query, $skipGroups));
+ $list = array_merge($list, $this->getContactsGroups($query));
}
}