diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-09-25 16:34:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-25 16:34:50 +0200 |
| commit | 3bd4e7e5412aafd3d444954aa6f73010029a3507 (patch) | |
| tree | c983f63a915630cf7bfcd3b04a97601687771aae | |
| parent | f2b7205a88a187cc4b0f3f240b225bc24afcd1f6 (diff) | |
| parent | f7790c2960f4fd509df7d93cca7e6441e7de89f3 (diff) | |
| download | nextcloud-server-3bd4e7e5412aafd3d444954aa6f73010029a3507.tar.gz nextcloud-server-3bd4e7e5412aafd3d444954aa6f73010029a3507.zip | |
Merge pull request #6632 from nextcloud/do_not_show_hyphen
Do not show hyphen
| -rw-r--r-- | apps/sharebymail/lib/ShareByMailProvider.php | 2 | ||||
| -rw-r--r-- | apps/sharebymail/tests/ShareByMailProviderTest.php | 2 | ||||
| -rw-r--r-- | lib/private/Share20/Manager.php | 2 |
3 files changed, 3 insertions, 3 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(); } diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php index 9ab9dbef4a1..23e61ee58f1 100644 --- a/apps/sharebymail/tests/ShareByMailProviderTest.php +++ b/apps/sharebymail/tests/ShareByMailProviderTest.php @@ -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 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(); } |