aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGit'Fellow <12234510+solracsf@users.noreply.github.com>2024-12-13 14:17:32 +0100
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2024-12-30 18:36:55 +0000
commitc2b05000c70f8026527b6e773b2bdd35485b27aa (patch)
tree13c541b0b44251590f32024254e1dbb0774e0b23
parent999f5dee00a0dd029c1a2da873c61075aa71bfd9 (diff)
downloadnextcloud-server-c2b05000c70f8026527b6e773b2bdd35485b27aa.tar.gz
nextcloud-server-c2b05000c70f8026527b6e773b2bdd35485b27aa.zip
fix(shares): Remove noisy text from emailsbackport/49847/stable30
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
-rw-r--r--apps/sharebymail/lib/ShareByMailProvider.php4
-rw-r--r--apps/sharebymail/tests/ShareByMailProviderTest.php24
-rw-r--r--lib/private/Share20/DefaultShareProvider.php4
3 files changed, 0 insertions, 32 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index d159e4ef5e0..afd9e309999 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -350,10 +350,6 @@ class ShareByMailProvider extends DefaultShareProvider implements IShareProvider
);
}
- $emailTemplate->addBodyText(
- $this->l->t('Click the button below to open it.')
- );
-
$emailTemplate->addBodyButton(
$this->l->t('Open %s', [$filename]),
$link
diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php
index 92219a7e9bb..18ca9574d6f 100644
--- a/apps/sharebymail/tests/ShareByMailProviderTest.php
+++ b/apps/sharebymail/tests/ShareByMailProviderTest.php
@@ -1304,10 +1304,6 @@ class ShareByMailProviderTest extends TestCase {
->with('Mrs. Owner User shared file.txt with you');
$template
->expects($this->once())
- ->method('addBodyText')
- ->with('Click the button below to open it.');
- $template
- ->expects($this->once())
->method('addBodyButton')
->with(
'Open file.txt',
@@ -1412,10 +1408,6 @@ class ShareByMailProviderTest extends TestCase {
->expects($this->once())
->method('addHeading')
->with('Mrs. Owner User shared file.txt with you');
- $template
- ->expects($this->once())
- ->method('addBodyText')
- ->with('Click the button below to open it.');
$this->urlGenerator->expects($this->once())->method('imagePath')
->with('core', 'caldav/description.png')
@@ -1538,10 +1530,6 @@ class ShareByMailProviderTest extends TestCase {
->expects($this->once())
->method('addHeading')
->with('Mrs. Owner User shared file.txt with you');
- $template
- ->expects($this->once())
- ->method('addBodyText')
- ->with('Click the button below to open it.');
$expiration = new DateTime('2001-01-01');
$this->l->expects($this->once())
@@ -1672,10 +1660,6 @@ class ShareByMailProviderTest extends TestCase {
->with('Mr. Initiator User shared file.txt with you');
$template
->expects($this->once())
- ->method('addBodyText')
- ->with('Click the button below to open it.');
- $template
- ->expects($this->once())
->method('addBodyButton')
->with(
'Open file.txt',
@@ -1773,10 +1757,6 @@ class ShareByMailProviderTest extends TestCase {
->with('Mrs. Owner User shared file.txt with you');
$template
->expects($this->once())
- ->method('addBodyText')
- ->with('Click the button below to open it.');
- $template
- ->expects($this->once())
->method('addBodyButton')
->with(
'Open file.txt',
@@ -1878,10 +1858,6 @@ class ShareByMailProviderTest extends TestCase {
->with('Mr. Initiator User shared file.txt with you');
$template
->expects($this->once())
- ->method('addBodyText')
- ->with('Click the button below to open it.');
- $template
- ->expects($this->once())
->method('addBodyButton')
->with(
'Open file.txt',
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index 00b8ed8070d..955eb187c46 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -1515,10 +1515,6 @@ class DefaultShareProvider implements IShareProviderWithNotification, IShareProv
$emailTemplate->addBodyText(htmlspecialchars($note), $note);
}
- $emailTemplate->addBodyText(
- $l->t('Click the button below to open it.')
- );
-
$emailTemplate->addBodyButton(
$l->t('Open %s', [$filename]),
$link