Skip to content

Feature pressynced 2954 add email template and email layout interception points #1739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
john5onCheng wants to merge 2 commits into
base: stable
Choose a base branch
from
+13 −2
Open

Feature pressynced 2954 add email template and email layout interception points #1739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e7989e
Merge pull request #1 from pixl8/stable
john5onCheng Feb 3, 2026
126855a
PRESSYNCED-2954 add email template and layout interception point
john5onCheng Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions system/config/Config.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,8 @@ component {
interceptorSettings.customInterceptionPoints.append( "postEditRecordAction" );
interceptorSettings.customInterceptionPoints.append( "preRenderRecordForViewRecord" );
interceptorSettings.customInterceptionPoints.append( "postRenderRecordForViewRecord" );
interceptorSettings.customInterceptionPoints.append( "prePrepareEmailHtmlContent" );
interceptorSettings.customInterceptionPoints.append( "postGetLayoutConfig" );
}

private void function __setupCachebox() {
Expand Down
8 changes: 7 additions & 1 deletion system/services/email/EmailLayoutService.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,13 @@ component {
}
}

return config;
var interceptorArgs = {
config = config
, args = arguments
};
$announceInterception( "postGetLayoutConfig", interceptorArgs );

return interceptorArgs.config;
}

// PRIVATE HELPERS
Expand Down
5 changes: 4 additions & 1 deletion system/services/email/EmailTemplateService.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1617,8 +1617,11 @@ component {
, unsubscribeLink
, template
, viewOnline
, cacheSuffix = ""
) {
var cacheKey = ( $helpers.isTrue( arguments.useDefaultContent ?: "" ) ? "default" : "saved" ) & "rawhtml" & arguments.template;
$announceInterception( "prePrepareEmailHtmlContent", arguments );

var cacheKey = arguments.cacheSuffix ?: ( $helpers.isTrue( arguments.useDefaultContent ?: "" ) ? "default" : "saved" ) & "rawhtml" & arguments.template;
Copy link

@cursor cursor bot Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Empty cache key causes all emails to share cache

High Severity

The Elvis operator (?:) only checks for null, not empty strings. Since cacheSuffix defaults to "" (line 1620), the expression arguments.cacheSuffix ?: (...) evaluates to "" instead of the fallback cache key calculation. This causes all email templates without an explicit cacheSuffix to share the same empty string cache key, resulting in the first rendered email being returned for all subsequent emails. The original logic constructed unique keys per template, but this change breaks that behavior.

Fix in Cursor Fix in Web

var fromCache = _getTemplateCache().get( cacheKey );

if ( !IsNull( local.fromCache ) ) {
Expand Down