summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorStephan Müller <mail@stephanmueller.eu>2017-09-10 16:33:58 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2017-09-25 09:20:46 +0200
commit86265320b892143c768a14054ab16678cfa2d256 (patch)
tree8a54e8a93a8f344f9503142204b783db35ca07af /lib
parent199c4b2ff9f6bffb8d89924c7d242db074830b24 (diff)
downloadnextcloud-server-86265320b892143c768a14054ab16678cfa2d256.tar.gz
nextcloud-server-86265320b892143c768a14054ab16678cfa2d256.zip
do not show hyphen after instance name in emails if slogan does not exist
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Share20/Manager.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index b4c4c7292fd..b2e192b8309 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -745,7 +745,7 @@ class Manager implements IManager {
$initiatorEmail = $initiatorUser->getEMailAddress();
if($initiatorEmail !== null) {
$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
- $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+ $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
} else {
$emailTemplate->addFooter();
}