Merge pull request #1093 from JohnDuprey/dev

Fix bug with template standards
KelvinTegelaar · Aug 27, 2024 · a033f08 · a033f08
2 parents c4d90ca + 1d9638f
commit a033f08
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Modules/CIPPCore/Public/Standards/Get-CIPPStandards.ps1 b/Modules/CIPPCore/Public/Standards/Get-CIPPStandards.ps1
@@ -64,7 +64,7 @@ function Get-CIPPStandards {
                     } else {
                         foreach ($Setting in $CurrentStandard.PSObject.Properties.Name) {
                             # Write-Host "$Setting - Current: $($CurrentStandard.$Setting) | Computed: $($ComputedStandards[$StandardName].$($Setting))"
-                            if ($CurrentStandard.$Setting -ne $false -and $CurrentStandard.$Setting -ne $ComputedStandards[$StandardName].$($Setting) -and ![string]::IsNullOrWhiteSpace($CurrentStandard.$Setting)) {
+                            if ($CurrentStandard.$Setting -ne $false -and ($CurrentStandard.$Setting -ne $ComputedStandards[$StandardName].$($Setting) -and ![string]::IsNullOrWhiteSpace($CurrentStandard.$Setting -or (Compare-Object $CurrentStandard.$Setting $ComputedStandards[$StandardName].$($Setting))))) {
                                 #Write-Host "Overriding $Setting for $StandardName at tenant level"
                                 if ($ComputedStandards[$StandardName].PSObject.Properties.Name -contains $Setting) {
                                     $ComputedStandards[$StandardName].$($Setting) = $CurrentStandard.$Setting