Bugfix in merging settings
This commit is contained in:
parent
0ca0707529
commit
0a2e325229
|
@ -44,7 +44,10 @@ abstract class SettingsAbstract
|
||||||
if (isset($other->{$name})
|
if (isset($other->{$name})
|
||||||
&& (
|
&& (
|
||||||
!isset($defaults[$name])
|
!isset($defaults[$name])
|
||||||
|| $other->{$name} !== $defaults[$name] // Isn't equal to the default value
|
|| (
|
||||||
|
$other->{$name} !== $defaults[$name] // Isn't equal to the default value
|
||||||
|
|| $other->{$name} !== $this->{$name} // Is equal, but current value is not the default one
|
||||||
|
)
|
||||||
)
|
)
|
||||||
&& $other->{$name} !== $this->{$name}
|
&& $other->{$name} !== $this->{$name}
|
||||||
) {
|
) {
|
||||||
|
|
Loading…
Reference in New Issue