Skip to content

Commit

Permalink
Merge branch 'development' of github.com:Ortus-Solutions/ContentBox i…
Browse files Browse the repository at this point in the history
…nto development
  • Loading branch information
lmajano committed Feb 13, 2024
2 parents 8fe39f5 + 0145dd1 commit a036994
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion config/Coldbox.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ component {
function development(){
coldbox.handlersIndexAutoReload = true;
coldbox.handlerCaching = false;
coldbox.debugMode = true;
coldbox.debugMode = true;
coldbox.reinitpassword = "";
coldbox.customErrorTemplate = "/coldbox/system/exceptions/Whoops.cfm";

Expand Down
5 changes: 4 additions & 1 deletion modules/contentbox/models/system/SettingService.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,10 @@ component
} )
// Build out array of settings to save
.each( function( key, value ){
var thisSetting = findWhere( { name : key, site : !isNull( arguments.site ) ? arguments.site : javaCast( "null", "" ) } );
var thisSetting = findWhere( {
name : key,
site : !isNull( arguments.site ) ? arguments.site : javacast( "null", "" )
} );

// Maybe it's a new setting :)
if ( isNull( thisSetting ) ) {
Expand Down

0 comments on commit a036994

Please sign in to comment.