diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-10-04 11:14:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-04 11:14:00 +0200 |
| commit | 0bca480efdf4f88e90203eb80be40ad4822da9c4 (patch) | |
| tree | bae62d28d8cc550c0a88284bd9846d79afc447db /apps/dav/lib | |
| parent | b976cd55353d3790cd93b22eaf52137fe4b85dff (diff) | |
| parent | aa956ab46e66f22876769fac4f53da4f0425192b (diff) | |
| download | nextcloud-server-0bca480efdf4f88e90203eb80be40ad4822da9c4.tar.gz nextcloud-server-0bca480efdf4f88e90203eb80be40ad4822da9c4.zip | |
Merge pull request #22969 from eleith/catch-no-instance-exception
broaden exception handling on webcal refresh
Diffstat (limited to 'apps/dav/lib')
| -rw-r--r-- | apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php b/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php index b11520015db..6182107a69c 100644 --- a/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php +++ b/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php @@ -4,6 +4,7 @@ declare(strict_types=1); /** * @copyright Copyright (c) 2020, Thomas Citharel <nextcloud@tcit.fr> + * @copyright Copyright (c) 2020, leith abdulla (<online-nextcloud@eleith.com>) * * @author Christoph Wurst <christoph@winzerhof-wurst.at> * @author Georg Ehrke <oc.list@georgehrke.com> @@ -45,6 +46,7 @@ use Sabre\DAV\Xml\Property\Href; use Sabre\VObject\Component; use Sabre\VObject\DateTimeParser; use Sabre\VObject\InvalidDataException; +use Sabre\VObject\Recur\NoInstancesException; use Sabre\VObject\ParseException; use Sabre\VObject\Reader; use Sabre\VObject\Splitter\ICalendar; @@ -140,7 +142,7 @@ class RefreshWebcalService { $calendarData = $vObject->serialize(); try { $this->calDavBackend->createCalendarObject($subscription['id'], $uri, $calendarData, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION); - } catch (BadRequest $ex) { + } catch (NoInstancesException | BadRequest $ex) { $this->logger->logException($ex); } } |