summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-02-21 09:38:21 +0100
committerAleksander Machniak <alec@alec.pl>2013-02-21 10:30:19 +0100
commite68d2a15f52dcc13e5b2a84a3d2f8645ccb5cec1 (patch)
treeca9a9327e841e97b81dfe9b455834be708f11883 /program
parentbdf5656026998ded6ddf5003bc257532388a9656 (diff)
Don't try to print file extension in a warning message if it's not available
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/get.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 84e666fbe..54d1a4e77 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -162,7 +162,10 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
html::div(array('class' => 'rcmail-inline-message rcmail-inline-warning'),
rcube_label(array(
'name' => 'attachmentvalidationerror',
- 'vars' => array('expected' => "$mimetype (.$file_extension)", 'detected' => "$real_mimetype (.$extensions[0])")
+ 'vars' => array(
+ 'expected' => $mimetype . ($file_extension ? "(.$file_extension)" : ''),
+ 'detected' => $real_mimetype . ($extensions[0] ? "(.$extensions[0])" : ''),
+ )
)) .
html::p(array('class' => 'rcmail-inline-buttons'),
html::tag('button',