LDEV-3889 fix changelog sorting

https://luceeserver.atlassian.net/browse/LDEV-3889
lucee · Jul 17, 2023 · 3382ae8 · 3382ae8
1 parent 1f1140d
commit 3382ae8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/core/src/main/cfml/context/admin/ext.functions.cfm b/core/src/main/cfml/context/admin/ext.functions.cfm
@@ -587,16 +587,18 @@
 	}
 
 	function toVersionsSorted(required array versions) localMode=true {
-		var vs = [=];
+		var sorted = queryNew("ver,sort");
 		loop array=arguments.versions item="local.v"{
-			vs[toVersionSortable(v)] = v;
+			row = queryAddRow(sorted);
+			querySetCell(sorted, "ver", v, row);
+			querySetCell(sorted, "sort", toVersionSortable(v), row);
 		}
-		var sorted = structSort(vs,"text", "desc");
-		var rtn = [=];
-		loop array=sorted item="local.v" {
-			rtn[v] = vs[v];
+		QuerySort(sorted, 'sort', 'desc');
+		var result = structNew("linked");
+		loop query=sorted {
+			result[sorted.sort] = sorted.ver;
 		}
-		return rtn;
+		return result;
 	}
 	
 	function toVersionSortable(required string version) localMode=true {

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.0.0.512-SNAPSHOT"/>
+  <property name="version" value="6.0.0.513-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.0.0.512-SNAPSHOT</version>
+  <version>6.0.0.513-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>