Merge branch 'hotfix-7.0.7' into stable

pixl8 · Oct 7, 2024 · f84c9e4 · f84c9e4
2 parents dc37595 + 913cf09
commit f84c9e4
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
 
+## 7.0.7
+
+* [#24](https://github.com/pixl8/Preside-CMS-CommandBox-Commands/pull/24) Sort order issue for app skeletons
+
 ## 7.0.6
 
 * [#23](https://github.com/pixl8/Preside-CMS-CommandBox-Commands/issues/23) Temporarily hardcode a better mysql driver that works with more versions of mysql and mariadb out of the box

diff --git a/commands/preside/new/site.cfc b/commands/preside/new/site.cfc
@@ -121,7 +121,7 @@ component {
 		if ( StructKeyExists( templates, "basic" ) ) {
 			ordered[ "basic" ] = templates.basic;
 		}
-		if ( StructKeyExists( templates, "basic" ) ) {
+		if ( StructKeyExists( templates, "webapp" ) ) {
 			ordered[ "webapp" ] = templates.webapp;
 		}
 		for( var key in templates ) {