Merge branch '6.2' into 7.0

# Conflicts: # core/src/main/java/lucee/runtime/config/ConfigWebFactory.java # loader/build.xml # loader/pom.xml
lucee · Dec 13, 2024 · 73e33ef · 73e33ef
2 parents 42b5a45 + d1d06c3
commit 73e33ef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/core/src/main/java/lucee/runtime/config/ConfigImpl.java b/core/src/main/java/lucee/runtime/config/ConfigImpl.java
@@ -1095,6 +1095,7 @@ public boolean getPSQL() {
 				if (psq == null) {
 					// PSQ
 					String strPSQ = ConfigFactoryImpl.getAttr(root, "preserveSingleQuote");
+					if (StringUtil.isEmpty(strPSQ)) strPSQ = ConfigFactoryImpl.getAttr(root, "datasourcePreserveSingleQuotes");
 					if (!StringUtil.isEmpty(strPSQ)) {
 						psq = Caster.toBoolean(strPSQ, Boolean.FALSE);
 					}
@@ -3449,6 +3450,7 @@ public boolean useCTPathCache() {
 				if (useCTPathCache == null) {
 					if (ConfigUtil.hasAccess(this, SecurityManager.TYPE_CUSTOM_TAG)) {
 						String strDoPathcache = ConfigFactoryImpl.getAttr(root, "customTagUseCachePath");
+						if (StringUtil.isEmpty(strDoPathcache, true)) strDoPathcache = ConfigFactoryImpl.getAttr(root, "customTagCachePaths");
 						if (!StringUtil.isEmpty(strDoPathcache, true)) {
 							useCTPathCache = Caster.toBooleanValue(strDoPathcache.trim(), true);
 						}
@@ -3604,6 +3606,7 @@ public boolean doLocalCustomTag() {
 					else {
 						if (ConfigUtil.hasAccess(this, SecurityManager.TYPE_CUSTOM_TAG)) {
 							String strDoCTLocalSearch = ConfigFactoryImpl.getAttr(root, "customTagLocalSearch");
+							if (StringUtil.isEmpty(strDoCTLocalSearch, true)) strDoCTLocalSearch = ConfigFactoryImpl.getAttr(root, "customTagSearchLocal");
 							if (!StringUtil.isEmpty(strDoCTLocalSearch)) {
 								doLocalCustomTag = Caster.toBooleanValue(strDoCTLocalSearch.trim(), true);
 							}
@@ -3708,6 +3711,7 @@ public boolean doCustomTagDeepSearch() {
 					else {
 						if (ConfigUtil.hasAccess(this, SecurityManager.TYPE_CUSTOM_TAG)) {
 							String strDoCTDeepSearch = ConfigFactoryImpl.getAttr(root, "customTagDeepSearch");
+							if (StringUtil.isEmpty(strDoCTDeepSearch, true)) strDoCTDeepSearch = ConfigFactoryImpl.getAttr(root, "customTagSearchSubdirectories");
 							if (!StringUtil.isEmpty(strDoCTDeepSearch)) {
 								doCustomTagDeepSearch = 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="7.0.0.76-SNAPSHOT"/>
+  <property name="version" value="7.0.0.77-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>7.0.0.76-SNAPSHOT</version>
+  <version>7.0.0.77-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>