From b8955a1ab01698ce25482a98e76d713ee65c4fb3 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 19 Dec 2011 22:22:29 +0000 Subject: [PATCH] Keep warnings when adding errors to notification --- importexport/inc/class.importexport_schedule_ui.inc.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/importexport/inc/class.importexport_schedule_ui.inc.php b/importexport/inc/class.importexport_schedule_ui.inc.php index 49f3ac3607..f0a5861c58 100644 --- a/importexport/inc/class.importexport_schedule_ui.inc.php +++ b/importexport/inc/class.importexport_schedule_ui.inc.php @@ -557,24 +557,27 @@ $notify->set_sender($data['account_id']); $notify->add_receiver($data['account_id']); $notify->set_subject(lang('Schedule import | export'). ' ' . lang('errors')); + $contents = ''; if($data['warnings']) { - $contents = lang($data['type']) . ' ' . lang('Warnings') . ' ' . egw_time::to() . ':'; + $contents .= lang($data['type']) . ' ' . lang('Warnings') . ' ' . egw_time::to() . ':'; foreach($data['warnings'] as $target => $message) { $contents .= "\n". (is_numeric($target) ? '' : $target."\n"); $contents .= is_array($message) ? implode("\n",$message) : $message; } + $contents .= "\n"; } if($data['errors']) { - $contents = lang($data['type']) . ' ' . lang('Errors') . ' ' . egw_time::to() . ':'; + $contents .= lang($data['type']) . ' ' . lang('Errors') . ' ' . egw_time::to() . ':'; foreach($data['errors'] as $target => $errors) { $contents .= "\n". (is_numeric($target) ? '' : $target."\n"); $contents .= is_array($errors) ? implode("\n",$errors) : $errors; } + $contents .= "\n"; } $notify->set_message($contents); $notify->send();