Skip to content

[stable24] Fix handling events without names in activities #32585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 2 commits into from
Jun 10, 2022
Merged

[stable24] Fix handling events without names in activities #32585

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d29bb5f
Fix handling events without names in activities
nickvergessen May 24, 2022
33d003d
Also trim the name
nickvergessen May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix handling events without names in activities 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot-nextcloud
nickvergessen authored and backportbot-nextcloud[bot] committed May 25, 2022
commit d29bb5ff9dea555c6de7fbd354195c2f4acbb8bb
4 changes: 2 additions & 2 deletions apps/dav/lib/CalDAV/Activity/Provider/Event.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ protected function generateObjectParameter(array $eventData) {
$params = [
'type' => 'calendar-event',
'id' => $eventData['id'],
'name' => $eventData['name'],

'name' => $eventData['name'] !== '' ? $eventData['name'] : $this->l->t('Untitled event'),
];

if (isset($eventData['link']) && is_array($eventData['link']) && $this->appManager->isEnabledForUser('calendar')) {
try {
// The calendar app needs to be manually loaded for the routes to be loaded
Expand Down