Skip to content

Commit eeb65f9

Browse files
committed
COLDBOX-1359 #resolve
Regression view layout relative app mapping paths
1 parent c443043 commit eeb65f9

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

system/web/Renderer.cfc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,8 +647,14 @@ component
647647

648648
// Default path is the conventions location
649649
var layoutPaths = [
650+
// Conventions location first
650651
"/#variables.appMapping#/#variables.layoutsConvention#/#arguments.layout#",
651-
"#variables.layoutsExternalLocation#/#arguments.layout#"
652+
// External location second
653+
"#variables.layoutsExternalLocation#/#arguments.layout#",
654+
// Application root last
655+
"/#variables.appMapping#/#arguments.layout#",
656+
// Absolute path last
657+
"#arguments.layout#"
652658
];
653659

654660
// Try to locate the view
@@ -784,8 +790,13 @@ component
784790

785791
// Default path is the conventions location, then the external location
786792
var viewPaths = [
793+
// Conventions location first
787794
"/#variables.appMapping#/#variables.viewsConvention#/#arguments.view#",
795+
// External location second
788796
"#variables.viewsExternalLocation#/#arguments.view#",
797+
// Application root
798+
"/#variables.appMapping#/#arguments.view#",
799+
// Absolute path last
789800
arguments.view
790801
];
791802

0 commit comments

Comments
 (0)