Skip to content

Conversation

@nickvergessen
Copy link
Member

Basically we should check all array-merges ... and make sure they dont merge by user id...

Fix #6580

Signed-off-by: Joas Schilling <coding@schilljs.com>
@MorrisJobke
Copy link
Member

Ignore the failed CI job

@blizzz
Copy link
Member

blizzz commented Nov 23, 2017

Can this pull in duplicate users? Or is this dealt with later?

@nickvergessen
Copy link
Member Author

Can this pull in duplicate users? Or is this dealt with later?

Actually it duplicated users before:

<?php

$a = ['123' => 'foobar1', 'abc'=> 'def3'];
$b = ['123' => 'foobar2', 'abc'=> 'def4'];

var_dump(array_merge($a, $b)); // array(3) { [0]=> string(7) "foobar1" ["abc"]=> string(4) "def4" [1]=> string(7) "foobar2" }
var_dump($a+$b); // array(2) { [123]=> string(7) "foobar1" ["abc"]=> string(4) "def3" }

https://3v4l.org/Ag5KV

@blizzz blizzz merged commit 98cdd98 into master Nov 23, 2017
@blizzz blizzz deleted the fix-user-list branch November 23, 2017 11:17
@blizzz
Copy link
Member

blizzz commented Nov 23, 2017

@nickvergessen do you do the backport?

@nickvergessen
Copy link
Member Author

See #7262

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants