Skip to content
Permalink
Browse files

Merge branch 'hotfix-10.10.82' into stable

  • Loading branch information...
DominicWatson committed Jul 9, 2019
2 parents 91e1482 + c26a5a4 commit eece8046d916d13cec23e15049ed4a77994f8498
Showing with 13 additions and 3 deletions.
  1. +12 −2 system/coldboxModifications/RequestContextDecorator.cfc
  2. +1 −1 system/services/forms/FormsService.cfc
@@ -953,14 +953,24 @@ component extends="coldbox.system.web.context.RequestContextDecorator" {
announceInterception( "onNotFound" );
getController().runEvent( "general.notFound" );
content reset=true type="text/html";header statusCode="404";
WriteOutput( getModel( "delayedStickerRendererService" ).renderDelayedStickerIncludes( getModel( "presideRenderer" ).renderLayout() ) );

var contentOutput = getModel( "presideRenderer" ).renderLayout();

contentOutput = getModel( "delayedStickerRendererService" ).renderDelayedStickerIncludes( contentOutput );
contentOutput = getModel( "delayedViewletRendererService" ).renderDelayedViewlets( contentOutput );
writeOutput( contentOutput );
abort;
}

public void function accessDenied( required string reason ) {
announceInterception( "onAccessDenied" , arguments );
getController().runEvent( event="general.accessDenied", eventArguments={ args=arguments }, private=true );
WriteOutput( getModel( "delayedStickerRendererService" ).renderDelayedStickerIncludes( getModel( "presideRenderer" ).renderLayout() ) );

var contentOutput = getModel( "presideRenderer" ).renderLayout();

contentOutput = getModel( "delayedStickerRendererService" ).renderDelayedStickerIncludes( contentOutput );
contentOutput = getModel( "delayedViewletRendererService" ).renderDelayedViewlets( contentOutput );
writeOutput( contentOutput );
abort;
}

@@ -1261,7 +1261,7 @@ component displayName="Forms service" {
var fieldMatched = false;
var fieldDeleted = false;
for( var mField in matchingFieldset.fields ){
if ( mField.name == field.name ) {
if ( ( mField.name ?: "" ) == field.name ) {
if ( IsBoolean( field.deleted ?: "" ) and field.deleted ) {
ArrayDelete( matchingFieldset.fields, mField );
fieldDeleted = true;

0 comments on commit eece804

Please sign in to comment.
You can’t perform that action at this time.