Merge branch '6.1' of https://github.com/lucee/Lucee into 6.1

lucee · Apr 21, 2024 · 1dac82e · 1dac82e
2 parents c19fbd5 + 4e10a8c
commit 1dac82e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/core/src/main/java/lucee/runtime/functions/system/GetApplicationSettings.java b/core/src/main/java/lucee/runtime/functions/system/GetApplicationSettings.java
@@ -170,6 +170,7 @@ public static Struct call(PageContext pc, boolean suppressFunctions, boolean onl
 		if (ac.getScopeCascading() != Config.SCOPE_SMALL) {
 			sct.setEL("searchImplicitScopes", ac.getScopeCascading() == Config.SCOPE_STANDARD);
 		}
+		sct.setEL("searchResults", Caster.toBoolean(acs.getAllowImplicidQueryCall()));
 
 		// adminMode
 		sct.setEL("singleContext", ConfigWebUtil.toAdminMode(((ConfigPro) pc.getConfig()).getAdminMode(), "single") == "single");

diff --git a/test/functions/getApplicationSettings.cfc b/test/functions/getApplicationSettings.cfc
@@ -68,6 +68,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
 				var as = getApplicationSettings(onlySupported=true);
 				expect( as ).toHaveKey("bufferoutput");
 				expect( as ).toHaveKey("suppresscontent");
+				expect( as ).toHaveKey("searchResults");
 			});
 		});
 	}

diff --git a/test/tickets/LDEV2772.cfc b/test/tickets/LDEV2772.cfc
@@ -38,6 +38,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
 
 		try {
 			application action="update" searchResults=false;
+			var as = getApplicationSettings();
+			expect( as.searchResults ).toBeFalse();
 			loop query="q" {
 				expect( isNull(a) ).toBeTrue();
 				expect( q.a ).toBe( 'query' );
@@ -47,6 +49,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
 			}
 
 			application action="update" searchQueries=true;
+			var as = getApplicationSettings();
+			expect( as.searchResults ).toBeTrue();
 			loop query="q" {
 				expect( isNull( a ) ).toBeFalse();
 				expect( q.a ).toBe( 'query' );