Fix accesslist when a user has an ID only containting 0-9#7168
Merged
Conversation
Signed-off-by: Joas Schilling <coding@schilljs.com>
MorrisJobke
approved these changes
Nov 20, 2017
Member
|
Ignore the failed CI job |
Member
|
Can this pull in duplicate users? Or is this dealt with later? |
Member
Author
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" } |
blizzz
approved these changes
Nov 23, 2017
Member
|
@nickvergessen do you do the backport? |
Member
Author
|
See #7262 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Basically we should check all array-merges ... and make sure they dont merge by user id...
Fix #6580