Merge branch 'hotfix-10.8.45' into stable

pixl8 · Sep 8, 2017 · a8f8c60 · a8f8c60
2 parents 4e0f8f2 + 9b1fd17
commit a8f8c60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/system/config/Config.cfc b/system/config/Config.cfc
@@ -412,7 +412,7 @@ component {
 		_loadConfigurationFromExtensions();
 
 		environments = {
-			local = "^local\.,\.local$,^localhost(:[0-9]+)?$,^127.0.0.1(:[0-9]+)?$"
+			local = "^local\.,\.local(:[0-9]+)?$,^localhost(:[0-9]+)?$,^127.0.0.1(:[0-9]+)?$"
 		};
 
 	}

diff --git a/system/handlers/formcontrols/DataExportFieldPicker.cfc b/system/handlers/formcontrols/DataExportFieldPicker.cfc
@@ -12,7 +12,7 @@ component {
 		var propertyNames = presideObjectService.getObjectAttribute( objectName=objectName, attributeName="propertyNames" );
 		var props         = presideObjectService.getObjectProperties( objectName=objectName );
 
-		args.defaultValue = dataExportService.getDefaultExportFieldsForObject( objectName ).selectFields.toList();
+		args.defaultValue = Len( args.defaultValue ?: "" ) ? args.defaultValue : dataExportService.getDefaultExportFieldsForObject( objectName ).selectFields.toList();
 		args.values       = [];
 		args.labels       = [];
 		args.multiple     = true;