diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-03-14 13:36:59 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-03-14 13:36:59 +0100 |
| commit | c29ca0e11d1f1b3e8695935615bf11e447c6ebf6 (patch) | |
| tree | e8ea1a4f7c6e91007197e81d331cb247b1f6a1b0 /program/steps/mail/import.inc | |
| parent | 50a57e9b755e80885c7a608924e6e860b28be541 (diff) | |
| parent | a9308158717265606ba4ad7fa0a290a35904c95d (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps/mail/import.inc')
| -rw-r--r-- | program/steps/mail/import.inc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/program/steps/mail/import.inc b/program/steps/mail/import.inc index 4f822e0e4..5a74feb9f 100644 --- a/program/steps/mail/import.inc +++ b/program/steps/mail/import.inc @@ -34,7 +34,6 @@ if (is_array($_FILES['_file'])) { list($mtype_primary,) = explode('/', rcube_mime::file_content_type($filepath, $_FILES['_file']['name'][$i], $_FILES['_file']['type'][$i])); if (!in_array($mtype_primary, array('text','message'))) { - $OUTPUT->show_message('importmessageerror', 'error'); continue; } @@ -46,7 +45,6 @@ if (is_array($_FILES['_file'])) { while ($line !== false && trim($line) == ''); if (!preg_match('/^From\s+-/', $line) && !preg_match('/^[a-z-_]+:\s+.+/i', $line)) { - $OUTPUT->show_message('importmessageerror', 'error'); continue; } |