COLDBOX-1289 - Resolve - Ensure Windows OS delimiters are accounted for (#593)

jclausen · web-flow · commit 82492016c5e3 · 2024-08-26T19:20:41.000+02:00
diff --git a/system/web/Renderer.cfc b/system/web/Renderer.cfc
@@ -921,11 +921,11 @@ component
 
 		// Check for directory helper convention first
 		var dPath = getDirectoryFromPath( results.viewPath );
-		if ( fileExists( expandPath( dPath & listLast( dPath, "/" ) & "Helper.cfm" ) ) ) {
-			results.viewHelperPath.append( dPath & listLast( dPath, "/" ) & "Helper.cfm" );
+		if ( fileExists( expandPath( dPath & listLast( dPath, "\/" ) & "Helper.cfm" ) ) ) {
+			results.viewHelperPath.append( dPath & listLast( dPath, "\/" ) & "Helper.cfm" );
 		}
-		if ( fileExists( expandPath( dPath & listLast( dPath, "/" ) & "Helper.bxm" ) ) ) {
-			results.viewHelperPath.append( dPath & listLast( dPath, "/" ) & "Helper.bxm" );
+		if ( fileExists( expandPath( dPath & listLast( dPath, "\/" ) & "Helper.bxm" ) ) ) {
+			results.viewHelperPath.append( dPath & listLast( dPath, "\/" ) & "Helper.bxm" );
 		}
 
 		// Check for view helper convention second

Original file line number	Diff line number	Diff line change
`@@ -921,11 +921,11 @@ component`
`921`	`921`
`922`	`922`	`// Check for directory helper convention first`
`923`	`923`	`var dPath = getDirectoryFromPath( results.viewPath );`
`924`		`- if ( fileExists( expandPath( dPath & listLast( dPath, "/" ) & "Helper.cfm" ) ) ) {`
`925`		`- results.viewHelperPath.append( dPath & listLast( dPath, "/" ) & "Helper.cfm" );`
	`924`	`+ if ( fileExists( expandPath( dPath & listLast( dPath, "\/" ) & "Helper.cfm" ) ) ) {`
	`925`	`+ results.viewHelperPath.append( dPath & listLast( dPath, "\/" ) & "Helper.cfm" );`
`926`	`926`	`}`
`927`		`- if ( fileExists( expandPath( dPath & listLast( dPath, "/" ) & "Helper.bxm" ) ) ) {`
`928`		`- results.viewHelperPath.append( dPath & listLast( dPath, "/" ) & "Helper.bxm" );`
	`927`	`+ if ( fileExists( expandPath( dPath & listLast( dPath, "\/" ) & "Helper.bxm" ) ) ) {`
	`928`	`+ results.viewHelperPath.append( dPath & listLast( dPath, "\/" ) & "Helper.bxm" );`
`929`	`929`	`}`
`930`	`930`
`931`	`931`	`// Check for view helper convention second`