From 60e0597308770e4ed9966332d1f27bd5e19fcc6e Mon Sep 17 00:00:00 2001 From: AdrianTze Date: Mon, 26 Jan 2026 11:33:02 +0800 Subject: [PATCH 1/2] PRESSYNCED-3009 Fix email preview showing wrong site template branding Include siteId in email template cache key to ensure templates are cached per site and prevent cross-site template contamination. --- system/services/email/EmailTemplateService.cfc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/services/email/EmailTemplateService.cfc b/system/services/email/EmailTemplateService.cfc index d5a653981a..4610c81a27 100644 --- a/system/services/email/EmailTemplateService.cfc +++ b/system/services/email/EmailTemplateService.cfc @@ -1618,7 +1618,8 @@ component { , template , viewOnline ) { - var cacheKey = ( $helpers.isTrue( arguments.useDefaultContent ?: "" ) ? "default" : "saved" ) & "rawhtml" & arguments.template; + var siteId = $getRequestContext().getSiteId() ?: ""; + var cacheKey = siteId & ( $helpers.isTrue( arguments.useDefaultContent ?: "" ) ? "default" : "saved" ) & "rawhtml" & arguments.template; var fromCache = _getTemplateCache().get( cacheKey ); if ( !IsNull( local.fromCache ) ) { From 9b7c473ce45fd9e3a09c5d064029303309630c73 Mon Sep 17 00:00:00 2001 From: AdrianTze Date: Mon, 26 Jan 2026 11:36:26 +0800 Subject: [PATCH 2/2] PRESSYNCED-3009 fix alignment --- system/services/email/EmailTemplateService.cfc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/services/email/EmailTemplateService.cfc b/system/services/email/EmailTemplateService.cfc index 4610c81a27..de50946b64 100644 --- a/system/services/email/EmailTemplateService.cfc +++ b/system/services/email/EmailTemplateService.cfc @@ -1618,8 +1618,8 @@ component { , template , viewOnline ) { - var siteId = $getRequestContext().getSiteId() ?: ""; - var cacheKey = siteId & ( $helpers.isTrue( arguments.useDefaultContent ?: "" ) ? "default" : "saved" ) & "rawhtml" & arguments.template; + var siteId = $getRequestContext().getSiteId() ?: ""; + var cacheKey = siteId & ( $helpers.isTrue( arguments.useDefaultContent ?: "" ) ? "default" : "saved" ) & "rawhtml" & arguments.template; var fromCache = _getTemplateCache().get( cacheKey ); if ( !IsNull( local.fromCache ) ) {