danog
/
MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix in merging settings

This commit is contained in:
Daniil Gentili 2020-10-07 16:58:48 +02:00
parent 0ca0707529
commit 0a2e325229
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/danog/MadelineProto/SettingsAbstract.php
View File

@ -44,7 +44,10 @@ abstract class SettingsAbstract
if (isset($other->{$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}
) {