Merge pull request #6632 from nextcloud/do_not_show_hyphen
Do not show hyphen
This commit is contained in:
commit
3bd4e7e541
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
|
@ -828,7 +828,7 @@ class ShareByMailProviderTest extends TestCase {
|
||||||
->method('setReplyTo')
|
->method('setReplyTo')
|
||||||
->with(['owner@example.com' => 'Mrs. Owner User']);
|
->with(['owner@example.com' => 'Mrs. Owner User']);
|
||||||
$this->defaults
|
$this->defaults
|
||||||
->expects($this->once())
|
->expects($this->exactly(2))
|
||||||
->method('getSlogan')
|
->method('getSlogan')
|
||||||
->willReturn('Testing like 1990');
|
->willReturn('Testing like 1990');
|
||||||
$template
|
$template
|
||||||
|
|
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue