Skip to content

[stable15] Respect classification of calendar events in activity stream#13439

Merged
MorrisJobke merged 3 commits intostable15from
backport/13430-15
Jan 9, 2019
Merged

[stable15] Respect classification of calendar events in activity stream#13439
MorrisJobke merged 3 commits intostable15from
backport/13430-15

Conversation

@nickvergessen
Copy link
Member

@nickvergessen nickvergessen commented Jan 9, 2019

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>
@MorrisJobke MorrisJobke mentioned this pull request Jan 9, 2019
1 task
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

Looks good!

@MorrisJobke MorrisJobke merged commit cf35e04 into stable15 Jan 9, 2019
@MorrisJobke MorrisJobke deleted the backport/13430-15 branch January 9, 2019 17:47
$result = $query->execute();

while ($row = $result->fetch()) {
$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't the column called c.principaluri. Might be the reason for #13499.

Copy link
Member

Choose a reason for hiding this comment

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

I think you are right.

Sign up for free to 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.

5 participants