diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-05-21 10:29:47 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-05-21 10:29:47 +0000 |
| commit | ce076e953378e1c3867d9ebf64fc614b56281a22 (patch) | |
| tree | 16414c8df2df9a14e57b21ac681aba919739178c | |
| parent | e2da1cf6e0f52a7c0be018d9fb3af163ea19477b (diff) | |
Removed kolab plugins; they will be maintaied and published in the Kolab project
git-svn-id: https://svn.roundcube.net/trunk@4796 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rwxr-xr-x | roundcubemail/bin/msgimport.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 4958bf8ef..bab451de2 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -7,6 +7,7 @@ CHANGELOG Roundcube Webmail - Added general rcube_cache class with Memcache and APC support - Improved caching performance by skipping writes of unchanged data - Option enable_caching replaced by imap_cache and messages_cache options +- Fix WORKFAX saving in address book (#1487910) - Add forward-as-attachment feature - jQuery-1.6.1 (#1487913, #1487144) - Improve display name composition when saving contacts (#1487143) diff --git a/roundcubemail/bin/msgimport.sh b/roundcubemail/bin/msgimport.sh index 74dc81617..845c585e1 100755 --- a/roundcubemail/bin/msgimport.sh +++ b/roundcubemail/bin/msgimport.sh @@ -79,7 +79,7 @@ if ($IMAP->connect($host, $args['user'], $args['pass'], $imap_port, $imap_ssl)) $fp = fopen($args['file'], 'r'); while (($line = fgets($fp)) !== false) { - if (preg_match('/^From\s+/', $line) && $lastline == '') + if (preg_match('/^From\s+-/', $line) && $lastline == '') { if (!empty($message)) { |