archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-13 03:14:03 +00:00
Code Activity

Merge branch '3.x' of github.com:stancl/tenancy into 3.x

Browse source
This commit is contained in:
Samuel Štancl 2020-06-01 09:51:26 +02:00
commit b2c240a9f0
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Features/TenantConfig.php
View file

@ -44,7 +44,6 @@ class TenantConfig implements Feature
public function setTenantConfig(Tenant $tenant): void
{
/** @var Tenant|Model $tenant */
foreach (static::$storageToConfigMap as $storageKey => $configKey) {
$override = $tenant->getAttribute($storageKey);
@ -53,7 +52,7 @@ class TenantConfig implements Feature
foreach ($configKey as $key) {
$this->originalConfig[$key] = $this->originalConfig[$key] ?? $this->config[$key];
$this->config[$key] = $override;
$this->config[$key] = $override;
}
} else {
$this->originalConfig[$configKey] = $this->originalConfig[$configKey] ?? $this->config[$configKey];