Merge branch 'hotfix-3.5.15' into stable

pixl8 · Oct 30, 2024 · 5afeec2 · 5afeec2
2 parents 0b97d7d + dd15a86
commit 5afeec2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.5.15
+
+* Non string renderers: respect returned data when it is an empty array or struct for rendering in results
+
 ## v3.5.14
 
 * Ability to set API level defaults for allowIdInsert and allowed verbs

diff --git a/services/DataApiService.cfc b/services/DataApiService.cfc
@@ -343,7 +343,7 @@ component {
 		if ( $getContentRendererService().rendererExists( renderer, "dataapi" ) ) {
 			try {
 				var renderedContent = $renderContent( renderer, arguments.value, "dataapi", arguments.fieldSettings );
-				if ( Len( renderedContent ?: "" ) ) {
+				if ( !IsSimpleValue( renderedContent ) || Len( renderedContent ?: "" ) ) {
 					return renderedContent;
 				}
 			} catch( any e ) {