Skip to content

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

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

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

Conversation

@nickvergessen

@nickvergessennickvergessen commented Jan 9, 2019

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

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

Tested and works 👍

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

Looks good!

@MorrisJobke
MorrisJobke merged commit cf35e04 into stable15Jan 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
Copy Markdown
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
Copy Markdown
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.

@go2shgo2sh mentioned this pull request Jan 11, 2019
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.

5 participants

@nickvergessen@rullzer@go2sh@MorrisJobke@ChristophWurst