Skip to content

[stable13] let user set avatar in nextcloud if LDAP provides invalid image data - #10089

Merged
blizzz merged 1 commit into
stable13from
backport/10083/stable13
Jul 4, 2018
Merged

[stable13] let user set avatar in nextcloud if LDAP provides invalid image data#10089
blizzz merged 1 commit into
stable13from
backport/10083/stable13

Conversation

@blizzz

Copy link
Copy Markdown
Member

backport of #10083 (without the test cleanup)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@codecov

codecovBot commented Jul 3, 2018

Copy link
Copy Markdown

Codecov Report

Merging #10089 into stable13 will increase coverage by 0.01%.
The diff coverage is 78.57%.

@@ Coverage Diff @@## stable13 #10089 +/- ##
==============================================
+ Coverage 51.43% 51.44% +0.01% - Complexity 25138 25140 +2 
==============================================
Files 1613 1613 Lines 95632 95636 +4 Branches 1376 1376 ==============================================
+ Hits 49186 49199 +13 + Misses 46446 46437 -9
Impacted FilesCoverage ΔComplexity Δ
apps/user_ldap/lib/User_LDAP.php78.43% <100%> (+1.94%)84 <0> (ø)⬇️
apps/user_ldap/lib/User/User.php77.85% <72.72%> (+1.58%)129 <5> (+2)⬆️

@rullzerrullzer 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.

🐘

@blizzz
blizzz merged commit 486dff0 into stable13Jul 4, 2018
@blizzz
blizzz deleted the backport/10083/stable13 branch July 4, 2018 22:54
@blizzzblizzz changed the title [stable13] let user set avatar in nextcloud von LDAP provides invalid image data[stable13] let user set avatar in nextcloud if LDAP provides invalid image dataJul 4, 2018
@MorrisJobkeMorrisJobke mentioned this pull request Jul 10, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbugfeature: ldap

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@blizzz@rullzer@skjnldsv