Skip to content

Prevent undefined offset 0 in findByUserIdOrMail - #16308

Merged
MorrisJobke merged 1 commit into
masterfrom
fix/undefined-offset-0
Jul 10, 2019
Merged

Prevent undefined offset 0 in findByUserIdOrMail#16308
MorrisJobke merged 1 commit into
masterfrom
fix/undefined-offset-0

Conversation

@kesselb

Copy link
Copy Markdown
Contributor

Fix a regression introduced by #10743

Discovered by @compagnon#16260

array_filter presevers the keys. If the first user is disabled and the second one enabled count will be 1 but index 0 undefined. Adjusted the tests to call findByUserIdOrMail directly because the email method catches any error and returns always success.

@kesselbkesselb added 3. to review Waiting for reviews regression labels Jul 9, 2019
@kesselbkesselb changed the title Reset array with array_valuesPrevent undefined offset 0 in findByUserIdOrMailJul 9, 2019
@kesselb
kesselbforce-pushed the fix/undefined-offset-0 branch from 7650049 to a3689b9CompareJuly 9, 2019 10:33
Comment threadcore/Controller/LostController.php Outdated
@kesselb
kesselbforce-pushed the fix/undefined-offset-0 branch from a3689b9 to 1ce7d7aCompareJuly 9, 2019 12:14
@MorrisJobkeMorrisJobke added this to the Nextcloud 17 milestone Jul 9, 2019
@kesselb
kesselbforce-pushed the fix/undefined-offset-0 branch from 1ce7d7a to 1bdf63aCompareJuly 9, 2019 17:26
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
kesselbforce-pushed the fix/undefined-offset-0 branch from 1bdf63a to d57540aCompareJuly 9, 2019 17:29

@compagnoncompagnon left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merged into #16260

@MorrisJobke

Copy link
Copy Markdown
Member

/backport to stable16

@MorrisJobke

Copy link
Copy Markdown
Member

/backport to stable15

@skjnldsvskjnldsv left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sense!

@MorrisJobke
MorrisJobke merged commit 5c21b29 into masterJul 10, 2019
@MorrisJobke
MorrisJobke deleted the fix/undefined-offset-0 branch July 10, 2019 10:16
@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable16 in #16325

@MorrisJobke

Copy link
Copy Markdown
Member

/backport to stable15

@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable15 in #16326

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

Labels

3. to reviewWaiting for reviewsregression

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@kesselb@MorrisJobke@nickvergessen@skjnldsv@compagnon