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

do not show hyphen after instance name in emails if slogan does not exist 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Stephan Müller 2017-09-10 16:33:58 +02:00 committed by Roeland Jago Douma
parent 199c4b2ff9
commit 86265320b8
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sharebymail/lib/ShareByMailProvider.php
View File

@ -423,7 +423,7 @@ class ShareByMailProvider implements IShareProvider {
$initiatorEmail = $initiatorUser->getEMailAddress(); $initiatorEmail = $initiatorUser->getEMailAddress();
if($initiatorEmail !== null) { if($initiatorEmail !== null) {
$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]); $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
} else { } else {
$emailTemplate->addFooter(); $emailTemplate->addFooter();
} }

2
lib/private/Share20/Manager.php
View File

@ -745,7 +745,7 @@ class Manager implements IManager {
$initiatorEmail = $initiatorUser->getEMailAddress(); $initiatorEmail = $initiatorUser->getEMailAddress();
if($initiatorEmail !== null) { if($initiatorEmail !== null) {
$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]); $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
} else { } else {
$emailTemplate->addFooter(); $emailTemplate->addFooter();
} }