diff options
| author | Aleksander Machniak <alec@alec.pl> | 2019-11-10 10:39:32 +0300 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2019-11-18 17:30:23 +0300 |
| commit | 4cf8952afaf13a71e56587e462563fbf77aa9d60 (patch) | |
| tree | 2c7cb8e4eb8ed24d24c9c10451df026784b1a26e /program | |
| parent | 338b25dec97aa404cc909778e1b8d0f59120013d (diff) | |
Fix PHP warning: "array_merge(): Expected parameter 2 to be an array, null given in sendmail.inc (#7003)
Diffstat (limited to 'program')
| -rw-r--r-- | program/steps/mail/sendmail.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index cfcaab6ea..19773656b 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -168,7 +168,7 @@ if ($files = rcube_utils::get_input_value('_attachments', rcube_utils::INPUT_POS unset($COMPOSE['attachments'][$idx]); } - $COMPOSE['attachments'] = array_merge(array_filter($files), $COMPOSE['attachments']); + $COMPOSE['attachments'] = array_merge(array_filter($files), (array) $COMPOSE['attachments']); } // Since we can handle big messages with disk usage, we need more time to work |