From f1440fb9d57fe249978d2b0b1b470f579d4dc2c2 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 6 Jun 2016 10:09:05 +0200 Subject: [PATCH] catch exception caused by wrongly formatted date, as it eg. stalls whole mail app, as we created placeholders of account for signature --- api/src/Storage/Merge.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php index cafce82747..1ddddf8785 100644 --- a/api/src/Storage/Merge.php +++ b/api/src/Storage/Merge.php @@ -229,7 +229,12 @@ abstract class Merge case 'bday': if ($value) { - $value = Api\DateTime::to($value, true); + try { + $value = Api\DateTime::to($value, true); + } + catch (Exception $e) { + unset($e); // ignore exception caused by wrongly formatted date + } } break; case 'owner': case 'creator': case 'modifier':