Merge branch 'Ortus-Solutions:development' into development

Author: gavinbaumanis

box.json

@@ -1,6 +1,6 @@
 {
     "name":"ContentBox Tester Site",
-    "version":"6.3.0",
+    "version":"6.4.0",
     "author":"Ortus Solutions <[email protected]>",
     "shortDescription":"A tester site for developing the ContentBox Modular CMS",
     "type":"cms",
@@ -28,7 +28,7 @@
         "commandbox-migrations":"*"
     },
     "devDependencies":{
-		"commandbox-boxlang":"*",
+        "commandbox-boxlang":"*",
         "commandbox-cfformat":"*",
         "commandbox-docbox":"*",
         "testbox":"*",

changelog.md

@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.3.2] - 2025-12-05
+
+### Fixed
+
+-   Fixed an issue where different engines were handing defaults
+
+## [6.3.1] - 2025-10-20
+
+## [6.3.0] - 2025-10-03
+
 ## [6.1.1] - 2025-03-19
 
 ## [6.1.0] - 2025-03-18
@@ -117,7 +127,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   [CONTENTBOX-1478](https://ortussolutions.atlassian.net/browse/CONTENTBOX-1478) Remove old tuckey urlrewrite.xml as this is now in the CommandBox Core
 -   [CONTENTBOX-1493](https://ortussolutions.atlassian.net/browse/CONTENTBOX-1493) ContentBox Express removed since we now have CommandBox
 
-[Unreleased]: https://github.com/Ortus-Solutions/ContentBox/compare/v6.1.1...HEAD
+[Unreleased]: https://github.com/Ortus-Solutions/ContentBox/compare/v6.3.2...HEAD
+
+[6.3.2]: https://github.com/Ortus-Solutions/ContentBox/compare/v6.3.1...v6.3.2
+
+[6.3.1]: https://github.com/Ortus-Solutions/ContentBox/compare/v6.3.0...v6.3.1
+
+[6.3.0]: https://github.com/Ortus-Solutions/ContentBox/compare/v6.1.1...v6.3.0
 
 [6.1.1]: https://github.com/Ortus-Solutions/ContentBox/compare/v6.1.0...v6.1.1
 

modules/contentbox/box.json

@@ -26,7 +26,7 @@
         "Curt Gratz <[email protected]>"
     ],
     "dependencies":{
-        "cborm":"^4.0.0",
+        "cborm":"^4.10.0",
         "cbjavaloader":"^2.0.0",
         "cbmailservices":"^2.0.0",
         "cbsecurity":"^3.0.0",

modules/contentbox/models/content/BaseContent.cfc

@@ -764,17 +764,35 @@ component
 	 */
 	function getFeaturedImageURL(){
 		var featured = getFeaturedImage();
-		return !isNull( featured ) && len( featured ) ? (
-			find( ":", featured )
-			 ? "/__media/" & featured
-			// legacy column values without disk annoations
-			 : replaceNoCase(
-				featured,
-				mediaService.getCoreMediaRoot(),
-				"/media"
-			)
-		)
-		 : "";
+		if ( isNull( featured ) || !len( featured ) ) {
+			return "";
+		}
+		var mediaRoot         = mediaService.getCoreMediaRoot();
+		var expandedMediaRoot = expandPath( mediaRoot );
+		// We have three scenarios in how the featured image entries are stored.
+		// The first is that the image was stored with a fully expanded path
+		if ( findNoCase( expandedMediaRoot, featured ) ) {
+			return replaceNoCase(
+				replaceNoCase( featured, expandedMediaRoot, "/__media" ),
+				"\",
+				"/",
+				"All"
+			);
+		}
+		// The second is a match to the relative media root
+		if ( findNoCase( mediaRoot, featured ) ) {
+			// Replace and change any windows delimiters that might be in the path
+			return replaceNoCase(
+				replaceNoCase( featured, mediaRoot, "/__media" ),
+				"\",
+				"/",
+				"All"
+			);
+		}
+		// The last is that it is modern cbfs disk paths
+		return find( ":", featured )
+		 ? "/__media/" & featured
+		 : featured;
 	}
 
 	/**

modules/contentbox/modules/contentbox-admin/handlers/baseContentHandler.cfc

@@ -265,13 +265,6 @@ component extends="baseHandler" {
 				event          = "contentbox-admin:comments.pager",
 				eventArguments = { contentID : rc.contentID }
 			);
-			// Get Child Pages Viewlet
-			prc.childPagesViewlet = pager(
-				event  = arguments.event,
-				rc     = arguments.rc,
-				prc    = arguments.prc,
-				parent = prc.oContent.getContentID()
-			);
 			// Get History Versions Viewlet
 			prc.versionsViewlet = runEvent(
 				event          = "contentbox-admin:versions.pager",

modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/handlers/Home.cfc

@@ -380,8 +380,6 @@ component extends="cbadmin.handlers.baseHandler" {
 		// param values
 		event.paramValue( "path", "" ).paramValue( "manual", false );
 
-		systemOutput( "path: [#rc.path#]", true );
-
 		// clean incoming path for destination directory
 		rc.path = cleanIncomingPath( urlDecode( trim( rc.path ) ) );
 

modules/contentbox/modules/contentbox-admin/views/contentStore/index.cfm

@@ -116,7 +116,7 @@
 											<cfloop array="#prc.availableTemplates#" item="template">
 												<li class="mb-5">
 													<a
-														href="#event.buildLink(  prc.xehContentEditor & "/parentId/" & encodeForHTMLAttribute( rc.parent ) & "?contentTemplate=" & #encodeForHTMLAttribute( template[ "templateID" ] )# )#"
+														href="#event.buildLink(  prc.xehContentEditor & "/parentId/" & encodeForHTMLAttribute( rc.parent ) & "?contentTemplate=" & encodeForHTMLAttribute( template[ "templateID" ] ) )#"
 													><small><i class="fa fa-plus"></i> #template[ "name" ]#</small></a>
 												</li>
 											</cfloop>

modules/contentbox/modules/contentbox-ui/handlers/page.cfc

@@ -169,21 +169,27 @@ component extends="content" {
 		prc.missingPage      = rc.pageUri;
 		prc.missingRoutedURL = event.getCurrentRoutedURL();
 
+		var interceptData =
+		{
+			page          : prc.page,
+			missingPage   : prc.missingPage,
+			routedURL     : prc.missingRoutedURL,
+			layout        : "#prc.cbTheme#/layouts/pages",
+			layoutModule  : prc.cbThemeRecord.module,
+			view          : "#prc.cbTheme#/views/notfound",
+			viewModule    : prc.cbThemeRecord.module,
+			statusCode    : "404",
+			statusMessage : "Page not found"
+		};
+
 		// announce event
-		announce(
-			"cbui_onPageNotFound",
-			{
-				page        : prc.page,
-				missingPage : prc.missingPage,
-				routedURL   : prc.missingRoutedURL
-			}
-		);
+		announce( "cbui_onPageNotFound", interceptData );
 
 		// Not Found layout + view
 		event
-			.setLayout( name = "#prc.cbTheme#/layouts/pages", module = prc.cbThemeRecord.module )
-			.setView( view = "#prc.cbTheme#/views/notfound", module = prc.cbThemeRecord.module )
-			.setHTTPHeader( "404", "Page not found" );
+			.setLayout( name = interceptData.layout, module = interceptData.layoutModule )
+			.setView( view = interceptData.view, module = interceptData.viewModule )
+			.setHTTPHeader( interceptData.statusCode, interceptData.statusMessage );
 	}
 
 	/**