Skip to content

[stable12] CardDAV convertor check should not be to wide - #7456

Merged
MorrisJobke merged 1 commit into
stable12from
12_7342
Dec 12, 2017
Merged

[stable12] CardDAV convertor check should not be to wide#7456
MorrisJobke merged 1 commit into
stable12from
12_7342

Conversation

@rullzer

Copy link
Copy Markdown
Member

Backport of #7342

Case: email is set to null, but the avatar is set. In the old case the
email would set $emptyValue but $noImage would still be false. This we
would set the empty string as email.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@codecov

codecovBot commented Dec 11, 2017

Copy link
Copy Markdown

Codecov Report

Merging #7456 into stable12 will increase coverage by <.01%.
The diff coverage is 100%.

@@ Coverage Diff @@## stable12 #7456 +/- ##
==============================================
+ Coverage 53.92% 53.93% +<.01% - Complexity 22701 22702 +1 
==============================================
Files 1384 1384 Lines 86955 86956 +1 Branches 1330 1330 ==============================================
+ Hits 46889 46896 +7 + Misses 40066 40060 -6
Impacted FilesCoverage ΔComplexity Δ
apps/dav/lib/CardDAV/Converter.php73.52% <100%> (+0.39%)24 <0> (+1)⬆️
apps/files_trashbin/lib/Trashbin.php72.28% <0%> (-0.25%)136% <0%> (ø)
core/js/js.js61.83% <0%> (+0.55%)0% <0%> (ø)⬇️
lib/private/Files/Cache/Propagator.php96.2% <0%> (+1.26%)16% <0%> (ø)⬇️
apps/files_trashbin/lib/Expiration.php91.93% <0%> (+1.61%)29% <0%> (ø)⬇️

@blizzzblizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 12, 2017
@MorrisJobke
MorrisJobke merged commit f44d5bd into stable12Dec 12, 2017
@MorrisJobke
MorrisJobke deleted the 12_7342 branch December 12, 2017 09:04
@MorrisJobkeMorrisJobke mentioned this pull request Jan 8, 2018
13 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: dav

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@rullzer@MorrisJobke@blizzz