Merge branch '6.1' into 6.2

# Conflicts: # loader/build.xml # loader/pom.xml
lucee · Dec 13, 2024 · d1d06c3 · d1d06c3
2 parents 4b37063 + 6d956ee
commit d1d06c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
@@ -2368,6 +2368,8 @@ else if (access >= SecurityManager.VALUE_1 && access <= SecurityManager.VALUE_10
 
 			// PSQ
 			String strPSQ = getAttr(root, "preserveSingleQuote");
+			if (StringUtil.isEmpty(strPSQ)) strPSQ = getAttr(root, "datasourcePreserveSingleQuotes");
+
 			if (access != SecurityManager.VALUE_NO && !StringUtil.isEmpty(strPSQ)) {
 				config.setPSQL(toBoolean(strPSQ, true));
 			}
@@ -2922,6 +2924,7 @@ private static void _loadCustomTagsMappings(ConfigServerImpl configServer, Confi
 
 			// do patch cache
 			String strDoPathcache = getAttr(root, "customTagUseCachePath");
+			if (StringUtil.isEmpty(strDoPathcache, true)) strDoPathcache = getAttr(root, "customTagCachePaths");
 			if (hasAccess && !StringUtil.isEmpty(strDoPathcache, true)) {
 				config.setUseCTPathCache(Caster.toBooleanValue(strDoPathcache.trim(), true));
 			}
@@ -2935,6 +2938,7 @@ else if (hasCS) {
 			}
 			else {
 				String strDoCTLocalSearch = getAttr(root, "customTagLocalSearch");
+				if (StringUtil.isEmpty(strDoCTLocalSearch, true)) strDoCTLocalSearch = getAttr(root, "customTagSearchLocal");
 				if (hasAccess && !StringUtil.isEmpty(strDoCTLocalSearch)) {
 					config.setDoLocalCustomTag(Caster.toBooleanValue(strDoCTLocalSearch.trim(), true));
 				}
@@ -2949,6 +2953,8 @@ else if (hasCS) {
 			}
 			else {
 				String strDoCTDeepSearch = getAttr(root, "customTagDeepSearch");
+				if (StringUtil.isEmpty(strDoCTDeepSearch, true)) strDoCTDeepSearch = getAttr(root, "customTagSearchSubdirectories");
+
 				if (hasAccess && !StringUtil.isEmpty(strDoCTDeepSearch)) {
 					config.setDoCustomTagDeepSearch(Caster.toBooleanValue(strDoCTDeepSearch.trim(), false));
 				}

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.209-SNAPSHOT"/>
+  <property name="version" value="6.2.0.210-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.209-SNAPSHOT</version>
+  <version>6.2.0.210-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>