diff --git a/ghost/core/core/server/services/gifts/email-templates/gift-delivery.hbs b/ghost/core/core/server/services/gifts/email-templates/gift-delivery.hbs
index e28a06366d3..990e6f31936 100644
--- a/ghost/core/core/server/services/gifts/email-templates/gift-delivery.hbs
+++ b/ghost/core/core/server/services/gifts/email-templates/gift-delivery.hbs
@@ -31,9 +31,9 @@
{{#if siteIconUrl}}
-
+
{{else}}
- {{siteTitle}}
+ {{siteTitle}}
{{/if}}
|
@@ -92,7 +92,7 @@
|
- {{t 'This message was sent from {siteDomain} to {email} on behalf of {buyerName} ({buyerEmail}).' siteDomain=(linkTag siteUrl siteDomain class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;") email=(linkTag (mailto toEmail) toEmail class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;") buyerName=buyerName buyerEmail=(linkTag (mailto buyerEmail) buyerEmail class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;")}}
+ {{t 'This message was sent from {siteDomain} to {email} on behalf of {buyerName} ({buyerEmail}).' siteDomain=siteDomain email=toEmail buyerName=buyerName buyerEmail=buyerEmail}}
|
diff --git a/ghost/core/core/server/services/gifts/email-templates/gift-delivery.ts b/ghost/core/core/server/services/gifts/email-templates/gift-delivery.ts
index e31695d8d86..c4b9c29e550 100644
--- a/ghost/core/core/server/services/gifts/email-templates/gift-delivery.ts
+++ b/ghost/core/core/server/services/gifts/email-templates/gift-delivery.ts
@@ -2,7 +2,6 @@ import type { Translate } from '../gift-email-renderer';
export interface GiftDeliveryEmailData {
siteTitle: string;
- siteUrl: string;
siteIconUrl: string | null;
siteDomain: string;
accentColor: string;
diff --git a/ghost/core/core/server/services/gifts/gift-email-service.ts b/ghost/core/core/server/services/gifts/gift-email-service.ts
index 4ba80d8e706..c8822355769 100644
--- a/ghost/core/core/server/services/gifts/gift-email-service.ts
+++ b/ghost/core/core/server/services/gifts/gift-email-service.ts
@@ -339,7 +339,6 @@ export class GiftEmailService {
const giftLink = `${siteUrl.replace(/\/$/, '')}/gift/${token}`;
const { html, text } = await this.renderer.renderDelivery({
siteTitle,
- siteUrl,
siteIconUrl: this.blogIcon.getIconUrl({ absolute: true, fallbackToDefault: false }),
siteDomain,
accentColor: this.accentColor,
diff --git a/ghost/core/test/unit/server/services/gifts/gift-email-service.test.js b/ghost/core/test/unit/server/services/gifts/gift-email-service.test.js
index 48bccfc8a16..ce3b22e8488 100644
--- a/ghost/core/test/unit/server/services/gifts/gift-email-service.test.js
+++ b/ghost/core/test/unit/server/services/gifts/gift-email-service.test.js
@@ -391,7 +391,9 @@ describe('GiftEmailService', function () {
);
sinon.assert.match(
message.html,
- sinon.match(/on behalf of Buyer \(]+href="mailto:buyer@example\.com"/),
+ sinon.match(
+ 'This message was sent from example.com to recipient@example.com on behalf of Buyer (buyer@example.com).',
+ ),
);
sinon.assert.match(message.html, sinon.match('background:#fff3ed'));
sinon.assert.match(message.html, sinon.match('color:#bd460c'));
@@ -424,7 +426,7 @@ describe('GiftEmailService', function () {
});
const html = bulkMailer.send.firstCall.firstArg.html;
- assert.match(html, /]*>Test Site<\/a>/);
+ assert.match(html, /]*>Test Site<\/span>/);
assert.doesNotMatch(html, /![]()