parseTokens error with complex data when using send-grid-protocol wit…

…h cbmailservices (#34) * Do not process tokens for dynamic templates * Fix formatting issues --------- Co-authored-by: Robert Zehnder <rzehnder@guerrilla-rf.com>
coldbox-modules · Sep 13, 2023 · 06a9f57 · 06a9f57
1 parent a90bfc1
commit 06a9f57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .vscode
+.idea
 
 .artifacts/**
 .tmp/**

diff --git a/models/MailService.cfc b/models/MailService.cfc
@@ -376,6 +376,9 @@ component accessors="true" singleton threadsafe {
 		var tokenMarker = getTokenMarker();
 		var key         = "";
 
+		// Do not process tokens if using dynamic template (send-grid-protocol)
+		if( arguments.mail.getType() == "template" ) return;
+
 		// Check mail parts for content
 		if ( arrayLen( mailparts ) ) {
 			// Loop over mail parts