Merge branch 'master' into seperate-sending-invitations

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/Service/MailService.php b/lib/Service/MailService.php
index c0edc085..fbd40984 100644
--- a/lib/Service/MailService.php
+++ b/lib/Service/MailService.php
@@ -223,7 +223,7 @@ class MailService {
 			$groupMembers = array_keys($this->groupManager->displayNamesInGroup($share->getUserId()));
 
 			foreach ($groupMembers as $member) {
-				if ($skipUser === $member) {
+				if ($skipUser === $member || !$this->userManager->get($member)->isEnabled() ) {
 					continue;
 				}
 
@@ -354,7 +354,7 @@ class MailService {
 
 			foreach ($log as $logItem) {
 				if ($logItem->getPollId() === $subscription->getPollId()) {
-					if ($poll->getAnonymous()) {
+					if ($poll->getAnonymous() || $poll->getShowResults() !== "always") {
 						$displayUser = "A user";
 					} elseif ($this->userManager->get($logItem->getUserId()) instanceof IUser) {
 						$displayUser = $this->userManager->get($logItem->getUserId())->getDisplayName();