Merge pull request #917 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Get-CIPPTextReplacement.ps1

@@ -44,8 +44,12 @@ function Get-CIPPTextReplacement {
         '%organizationid%'
     )
 
-    $Tenant = Get-Tenants -TenantFilter $TenantFilter
-    $CustomerId = $Tenant.customerId
+    if ($TenantFilter -ne $env:TenantID) {
+        $Tenant = Get-Tenants -TenantFilter $TenantFilter
+        $CustomerId = $Tenant.customerId
+    } else {
+        $CustomerId = $TenantFilter
+    }
 
     #connect to table, get replacement map. The replacement map will allow users to create custom vars that get replaced by the actual values per tenant. Example:
     # %WallPaperPath% gets replaced by RowKey WallPaperPath which is set to C:\Wallpapers for tenant 1, and D:\Wallpapers for tenant 2