Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2014-03-14 c29ca0e11d1f1b3e8695935615bf11e447c6ebf6

 program/steps/mail/import.inc

@@ -34,7 +34,6 @@
            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 @@
            while ($line !== false && trim($line) == '');

            if (!preg_match('/^From\s+-/', $line) && !preg_match('/^[a-z-_]+:\s+.+/i', $line)) {
                $OUTPUT->show_message('importmessageerror', 'error');
                continue;
            }