Skip to content

Commit 06a9f57

Browse files
robertzRobert Zehnder
andauthored
parseTokens error with complex data when using send-grid-protocol with cbmailservices (#34)
* Do not process tokens for dynamic templates * Fix formatting issues --------- Co-authored-by: Robert Zehnder <[email protected]>
1 parent a90bfc1 commit 06a9f57

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.vscode
2+
.idea
23

34
.artifacts/**
45
.tmp/**

models/MailService.cfc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,9 @@ component accessors="true" singleton threadsafe {
376376
var tokenMarker = getTokenMarker();
377377
var key = "";
378378

379+
// Do not process tokens if using dynamic template (send-grid-protocol)
380+
if( arguments.mail.getType() == "template" ) return;
381+
379382
// Check mail parts for content
380383
if ( arrayLen( mailparts ) ) {
381384
// Loop over mail parts

0 commit comments

Comments
 (0)