Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Müller <mail@stephanmueller.eu>2017-09-10 17:33:58 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2017-09-25 10:20:46 +0300
commit86265320b892143c768a14054ab16678cfa2d256 (patch)
tree8a54e8a93a8f344f9503142204b783db35ca07af /apps/sharebymail/lib
parent199c4b2ff9f6bffb8d89924c7d242db074830b24 (diff)
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 'apps/sharebymail/lib')
-rw-r--r--apps/sharebymail/lib/ShareByMailProvider.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index 9a0678f5fe7..516e4e243bf 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -423,7 +423,7 @@ class ShareByMailProvider implements IShareProvider {
$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();
}