summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-09-25 16:34:50 +0200
committerGitHub <noreply@github.com>2017-09-25 16:34:50 +0200
commit3bd4e7e5412aafd3d444954aa6f73010029a3507 (patch)
treec983f63a915630cf7bfcd3b04a97601687771aae /lib
parentf2b7205a88a187cc4b0f3f240b225bc24afcd1f6 (diff)
parentf7790c2960f4fd509df7d93cca7e6441e7de89f3 (diff)
downloadnextcloud-server-3bd4e7e5412aafd3d444954aa6f73010029a3507.tar.gz
nextcloud-server-3bd4e7e5412aafd3d444954aa6f73010029a3507.zip
Merge pull request #6632 from nextcloud/do_not_show_hyphen
Do not show hyphen
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();
}