From 248d781e5f2caa26b4608d6de572e5a143321a91 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Tue, 14 Aug 2012 12:20:02 +0200 Subject: Improve text wrapping in replies --- program/steps/mail/func.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'program') 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 = ''; -- cgit v1.2.3 From e1cfb0bc01395bc71162cdd986234f3fe009edb4 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 14 Aug 2012 14:09:39 +0200 Subject: s/rcmail/rcube/ --- program/include/rcube_ldap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'program') 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)) -- cgit v1.2.3