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

Merge pull request #6632 from nextcloud/do_not_show_hyphen 

Do not show hyphen
This commit is contained in:
Roeland Jago Douma 2017-09-25 16:34:50 +02:00 committed by GitHub
parent f2b7205a88 f7790c2960
commit 3bd4e7e541
3 changed files with 3 additions and 3 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();
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();
}

2
apps/sharebymail/tests/ShareByMailProviderTest.php
View File

@ -828,7 +828,7 @@ class ShareByMailProviderTest extends TestCase {
->method('setReplyTo')
->with(['owner@example.com' => 'Mrs. Owner User']);
$this->defaults
->expects($this->once())
->expects($this->exactly(2))
->method('getSlogan')
->willReturn('Testing like 1990');
$template

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

@ -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();
}