Merge pull request #27209 from nextcloud/backport/27199/stable20

MorrisJobke · web-flow · commit 16ae1e8c3c4f · 2021-06-07T10:47:09.000+02:00
[stable20] Use noreply@ as email address for share emails
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
@@ -910,7 +910,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
`@@ -910,7 +910,7 @@ protected function sendMailNotification(IL10N $l,`
`910`	`910`	`$instanceName`
`911`	`911`	`]`
`912`	`912`	`);`
`913`		`- $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);`
	`913`	`+ $message->setFrom([\OCP\Util::getDefaultEmailAddress('noreply') => $senderName]);`
`914`	`914`
`915`	`915`	`// The "Reply-To" is set to the sharer if an mail address is configured`
`916`	`916`	`// also the default footer contains a "Do not reply" which needs to be adjusted.`