Skip to content

Commit

Permalink
Update core
Browse files Browse the repository at this point in the history
- no need to conserve
  • Loading branch information
RainbowMiner committed Feb 17, 2020
1 parent 6593a3d commit af2398c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion API.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@
$Result | Add-Member $GetConfigA[0] ([PSCustomObject]@{
isnew = $GetConfigNew
lwt = $ConfigLwt
data = if ($GetConfigNew) {Get-ConfigContent -ConfigName $GetConfigA[0] -WorkerName $Parameters.workername -GroupName $Parameters.groupname -ConserveUnkownParameters}
data = if ($GetConfigNew) {Get-ConfigContent -ConfigName $GetConfigA[0] -WorkerName $Parameters.workername -GroupName $Parameters.groupname}
}) -Force
$Status = $true
}
Expand Down
4 changes: 2 additions & 2 deletions Include.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -5166,11 +5166,11 @@ function Get-ServerConfig {
$PathToFile = $ConfigFiles[$_].Path
$Data = $Result.Content.$_.data
if ($_ -eq "config") {
$Preset = Get-ConfigContent "config" -ConserveUnkownParameters
$Preset = Get-ConfigContent "config"
$Data.PSObject.Properties.Name | Where-Object {$ExcludeConfigVars -inotcontains $_} | Foreach-Object {$Preset | Add-Member $_ $Data.$_ -Force}
$Data = $Preset
} elseif ($_ -eq "pools") {
$Preset = Get-ConfigContent "pools" -ConserveUnkownParameters
$Preset = Get-ConfigContent "pools"
$Preset.PSObject.Properties.Name | Where-Object {$Data.$_ -eq $null -or $ExcludeConfigVars -match "^pools:$($_)$"} | Foreach-Object {$Data | Add-Member $_ $Preset.$_ -Force}
$ExcludeConfigVars -match "^pools:.+:.+$" | Foreach-Object {
$PoolName = ($_ -split ":")[1]
Expand Down

0 comments on commit af2398c

Please sign in to comment.