Skip to content

[stable17] fix OCA\DAV\CalDAV\CalDavBackend search $options#20189

Merged
MorrisJobke merged 4 commits intostable17from
backport/18679/stable17
Apr 14, 2020
Merged

[stable17] fix OCA\DAV\CalDAV\CalDavBackend search $options#20189
MorrisJobke merged 4 commits intostable17from
backport/18679/stable17

Conversation

@tcitworld
Copy link
Member

backport of #18679

@rullzer rullzer mentioned this pull request Apr 13, 2020
5 tasks
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 14, 2020
@skjnldsv
Copy link
Member

skjnldsv commented Apr 14, 2020

Everything is failing

PHP Fatal error: Cannot use OCA\DAV\Connector\Sabre\Principal as Principal because the name is already in use in /drone/src/apps/dav/lib/CalDAV/CalDavBackend.php on line 41

@skjnldsv skjnldsv added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Apr 14, 2020
@tcitworld tcitworld force-pushed the backport/18679/stable17 branch from 2c5ac93 to 6b6d27b Compare April 14, 2020 09:37
@tcitworld
Copy link
Member Author

Fixed.

@tcitworld tcitworld added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Apr 14, 2020
@tcitworld tcitworld force-pushed the backport/18679/stable17 branch from 6b6d27b to 9a0cf46 Compare April 14, 2020 09:41
@MorrisJobke MorrisJobke merged commit 6ec7d6d into stable17 Apr 14, 2020
@MorrisJobke MorrisJobke deleted the backport/18679/stable17 branch April 14, 2020 12:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish bug feature: dav

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants