Skip to content

Fix for COLDBOX-1348 #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GunnarLieb wants to merge 1 commit into
base: releases/v7.x
Choose a base branch
from
Open

Fix for COLDBOX-1348 #631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 16 additions & 12 deletions system/web/Renderer.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,19 +605,23 @@ component
}
}

// Discover the layout location + helpers
var layoutLocations = discoverViewPaths(
view : cbox_currentLayout,
module : arguments.module,
explicitModule: cbox_explicitModule,
isLayout : true
);

// If Layout is blank, then just delegate to the view
// No layout rendering.
if ( len( cbox_currentLayout ) eq 0 ) {
iData.renderedLayout = this.view();
// Announce
if ( not arguments.prePostExempt ) {
announce( "postLayoutRender", iData );
}
} else {
// Discover the layout location + helpers
var layoutLocations = discoverViewPaths(
view : cbox_currentLayout,
module : arguments.module,
explicitModule: cbox_explicitModule,
isLayout : true
);

// Render the layout with it's helpers
iData.renderedLayout = renderViewComposite(
view : cbox_currentLayout,
Expand All @@ -626,11 +630,11 @@ component
args : args,
viewVariables : arguments.viewVariables
);
}

// Announce
if ( not arguments.prePostExempt ) {
announce( "postLayoutRender", iData.append( { viewPath : layoutLocations.viewPath } ) );
// Announce
if ( not arguments.prePostExempt ) {
announce( "postLayoutRender", iData.append( { viewPath : layoutLocations.viewPath } ) );
}
}

return iData.renderedLayout;
Expand Down