From 7c851e669e660655b6d7bd59dd2cd7cfe7d5fff3 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 21 Feb 2013 03:38:21 -0500
Subject: [PATCH] Don't try to print file extension in a warning message if it's not available
---
program/steps/mail/get.inc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 84e666f..54d1a4e 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -162,7 +162,10 @@
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',
--
Gitblit v1.9.1