From 0bcae89d141fb8fd35477b5b847360fbf3eb32f1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 1 Sep 2015 10:24:21 +0200 Subject: Handle InvalidArgumentException more gracefully --- lib/private/notification/manager.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php index 0b3b68a4065..c721f610113 100644 --- a/lib/private/notification/manager.php +++ b/lib/private/notification/manager.php @@ -122,7 +122,10 @@ class Manager implements IManager { $apps = $this->getApps(); foreach ($apps as $app) { - $app->notify($notification); + try { + $app->notify($notification); + } catch (\InvalidArgumentException $e) { + } } } @@ -139,11 +142,13 @@ class Manager implements IManager { foreach ($notifiers as $notifier) { try { $notifier->prepare($notification, $languageCode); - } catch (\InvalidArgumentException $e) {} - } + } catch (\InvalidArgumentException $e) { + continue; + } - if (!$notification->isValidParsed()) { - throw new \InvalidArgumentException('The given notification has not been handled'); + if (!$notification->isValidParsed()) { + throw new \InvalidArgumentException('The given notification has not been handled'); + } } return $notification; -- cgit v1.2.3