Skip to content

[stable14] Respect classification of calendar events in activity stream - #13441

Merged
rullzer merged 3 commits into
stable14from
backport/13430-14
Jan 9, 2019
Merged

[stable14] Respect classification of calendar events in activity stream#13441
rullzer merged 3 commits into
stable14from
backport/13430-14

Conversation

@nickvergessen

Copy link
Copy Markdown
Member

Backport of #13430

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
@MorrisJobkeMorrisJobke mentioned this pull request Jan 9, 2019
1 task
$currentUser = $owner;
}

$classification = $objectData['classification'] ?? CalDavBackend::CLASSIFICATION_PUBLIC;

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.

⚠️ isn't the ?? a php7 feature and stable14 still support 5.6?

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.

No stable14 is php 7.0+

@rullzer
rullzer merged commit d52666d into stable14Jan 9, 2019
@rullzer
rullzer deleted the backport/13430-14 branch January 9, 2019 19:21
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nickvergessen@MorrisJobke@ChristophWurst@rullzer