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

Thomas Bruederli

2012-08-14 c0aedfa34a641d5116ae8b8d5c1009c54ffee3b0

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

 plugins/managesieve/Changelog

@@ -1,3 +1,5 @@
- Fixed issue with DBMail bug [http://pear.php.net/bugs/bug.php?id=19077] (#1488594)

* version 5.2 [2012-07-24]
-----------------------------------------------------------
- Added GUI for variables setting - RFC5229 (patch from Paweł Słowik)

 plugins/managesieve/lib/Net/Sieve.php

@@ -1098,7 +1098,9 @@
                    return PEAR::raiseError(trim($response . $line), 6);
                }

                if (preg_match('/^{([0-9]+)}/i', $line, $matches)) {
                // "\+?" is added in the regexp to workaround DBMail bug
                // http://dbmail.org/mantis/view.php?id=963
                if (preg_match('/^{([0-9]+)\+?}/i', $line, $matches)) {
                    // Matches literal string responses.
                    $line = $this->_recvBytes($matches[1] + 2);