Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions system/web/Renderer.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -605,20 +605,20 @@ component
}
}

// Discover the layout location + helpers
var layoutLocations = discoverViewPaths(
view : cbox_currentLayout,
module : arguments.module,
explicitModule: cbox_explicitModule,
isLayout : true
);
// Layout location holder — only populated when layout is non-empty.
// discoverViewPaths throws on an empty layout name (regression vs ColdBox 7).
var layoutLocations = { viewPath : "", viewHelperPath : [] };

// If Layout is blank, then just delegate to the view
// No layout rendering.
// If Layout is blank, then just delegate to the view (no layout rendering).
if ( len( cbox_currentLayout ) eq 0 ) {
iData.renderedLayout = this.view();
} else {
// Render the layout with it's helpers
layoutLocations = discoverViewPaths(
view : cbox_currentLayout,
module : arguments.module,
explicitModule: cbox_explicitModule,
isLayout : true
);
iData.renderedLayout = renderViewComposite(
view : cbox_currentLayout,
viewPath : layoutLocations.viewPath,
Expand Down
Loading