diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-08-14 15:10:50 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-08-14 15:10:50 +0200 |
| commit | c965c8abe1aa55a70844e2c95de9bb8d8293e9eb (patch) | |
| tree | c10cbdcd646062396e1a61bce74dfd148f36f18c /program | |
| parent | b8dc3e0e61311fe03f21761fd7de1ca80d10c990 (diff) | |
| parent | e1cfb0bc01395bc71162cdd986234f3fe009edb4 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_ldap.php | 4 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index 3a7fc1805..5561613db 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -767,9 +767,9 @@ class rcube_ldap extends rcube_addressbook } // use VLV pseudo-search for autocompletion - $rcmail = rcmail::get_instance(); + $rcube = rcube::get_instance(); - if ($this->prop['vlv_search'] && $this->conn && join(',', (array)$fields) == join(',', $rcmail->config->get('contactlist_fields'))) + if ($this->prop['vlv_search'] && $this->conn && join(',', (array)$fields) == join(',', $rcube->config->get('contactlist_fields'))) { // add general filter to query if (!empty($this->prop['filter']) && empty($this->filter)) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index b2f81d73c..3d65eacb1 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1488,7 +1488,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null, function rcmail_wrap_and_quote($text, $length = 72) { // Rebuild the message body with a maximum of $max chars, while keeping quoted message. - $max = min(77, $length + 8); + $max = max(75, $length + 8); $lines = preg_split('/\r?\n/', trim($text)); $out = ''; |