Merge pull request #27208 from nextcloud/backport/27199/stable21

kesselb · web-flow · commit b1fdb4a86e78 · 2021-05-28T15:03:44.000+02:00
[stable21] Use noreply@ as email address for share emails
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
@@ -911,7 +911,7 @@ protected function sendMailNotification(IL10N $l,
 				$instanceName
 			]
 		);
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+		$message->setFrom([\OCP\Util::getDefaultEmailAddress('noreply') => $senderName]);
 
 		// The "Reply-To" is set to the sharer if an mail address is configured
 		// also the default footer contains a "Do not reply" which needs to be adjusted.

Original file line number	Diff line number	Diff line change
`@@ -911,7 +911,7 @@ protected function sendMailNotification(IL10N $l,`
`911`	`911`	`$instanceName`
`912`	`912`	`]`
`913`	`913`	`);`
`914`		`- $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);`
	`914`	`+ $message->setFrom([\OCP\Util::getDefaultEmailAddress('noreply') => $senderName]);`
`915`	`915`
`916`	`916`	`// The "Reply-To" is set to the sharer if an mail address is configured`
`917`	`917`	`// also the default footer contains a "Do not reply" which needs to be adjusted.`