Skip to content

Commit a241b22

Browse files
authored
Update server.export.cfm
fix timezone and option export of datasources
1 parent c8b23c5 commit a241b22

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

core/src/main/cfml/context/admin/server.export.cfm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ if(datasources.clob) optional.append('clob:#datasources.clob# // default: false'
219219
if(isNumeric(datasources.connectionLimit))optional.append('connectionLimit:#datasources.connectionLimit# // default:-1');
220220
if(datasources.connectionTimeout NEQ 1)optional.append('connectionTimeout:#datasources.connectionTimeout# // default: 1; unit: seconds');
221221
if(datasources.metaCacheTimeout NEQ 60000)optional.append(',metaCacheTimeout:#datasources.metaCacheTimeout# // default: 60000; unit: milliseconds');
222-
if(len(datasources.timezone))optional.append("timezone:'#replace(datasources.timezone,"'","''","all")#'");
222+
if(len(datasources.timezone))optional.append("timezone:'#replace(datasources.timezone,"'","''","all")#' // default is same as lucee instance");
223223
if(datasources.storage) optional.append('storage:#datasources.storage# // default: false');
224224
if(datasources.readOnly) optional.append('readOnly:#datasources.readOnly# // default: false');
225225
</cfscript>
@@ -230,7 +230,8 @@ if(datasources.readOnly) optional.append('readOnly:#datasources.readOnly# // def
230230
, password: "#datasources.passwordEncrypted#"</cfif><cfif optional.len()>
231231

232232
// optional settings
233-
<cfloop array="#optional#" index="i" item="value">, #value#<cfif i LT optional.len()>
233+
<cfloop array="#optional#" index="i" item="value"><cfif i LT optional.len()>#replace(value, " // default", ", // default")#
234+
<cfelse>#value#
234235
</cfif></cfloop></cfif>
235236
};
236237
</cfloop>

0 commit comments

Comments
 (0)