extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-27 05:11:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Stop EGroupware\Status\Videoconference\Call::getMeetingRegex() from breaking the import

Browse Source 
Jitsi backend was crashing with no error
This commit is contained in:
nathan 2023-12-15 15:38:15 -07:00
parent 1dc3a2cf62
commit 48068da833
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.calendar_ical.inc.php
View File

@ -2528,8 +2528,13 @@ class calendar_ical extends calendar_boupdate
// Remove videoconference link appended to description in calendar_groupdav->iCal() // Remove videoconference link appended to description in calendar_groupdav->iCal()
if (!empty($event['description']) && class_exists('EGroupware\Status\Videoconference\Call')) if (!empty($event['description']) && class_exists('EGroupware\Status\Videoconference\Call'))
{
static $regex = "";
if(!$regex)
{ {
$regex = "/^(\r?\n)?(Videoconference|" . lang('Videoconference') . "):\r?\n" . str_replace('/', '\/', EGroupware\Status\Videoconference\Call::getMeetingRegex()) . "(\r?\n)*/im"; $regex = "/^(\r?\n)?(Videoconference|" . lang('Videoconference') . "):\r?\n" . str_replace('/', '\/', EGroupware\Status\Videoconference\Call::getMeetingRegex()) . "(\r?\n)*/im";
}
$event['description'] = preg_replace($regex, '', $event['description']); $event['description'] = preg_replace($regex, '', $event['description']);
} }