head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.2
	pkgsrc-2013Q2-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2013.06.16.22.04.07;	author taca;	state dead;
branches;
next	1.1;
commitid	KB5USoBwVpaQ8TTw;

1.1
date	2013.06.15.16.08.09;	author taca;	state Exp;
branches;
next	;
commitid	Qx8UmbkQjRHFcJTw;


desc
@@


1.2
log
@Update roundcube to 0.9.2.

RELEASE 0.9.2
-------------
- Fix image thumbnails display in print mode (#1489134)
- Fix height of message headers block (#1489108)
- Fix timeout issue on drag&drop uploads (#1489170)
- Fix default sorting of threaded list when THREAD=REFS isn't supported
- Fix list mode switch to 'List' after saving list settings in Larry skin (#1489164)
- Fix error when there's no writeable addressbook source (#1489162)
- Fix zipdownload plugin issue with filenames charset (#1489156)
- Fix so non-inline images aren't skipped on forward (#1489150)
- Fix "null" instead of empty string on messages list in IE10 (#1489145)
- Fix legacy options handling
- Fix so bounces addresses in Sender headers are skipped on Reply-All (#1489011)
- Fix bug where serialized strings were truncated in PDO::quote() (#1489142)
- Fix displaying messages with invalid self-closing HTML tags (#1489137)
- Fix PHP warning when responding to a message with many Return-Path headers (#1489136)
- Fix unintentional compose window resize (#1489114)
- Fix performance regression in text wrapping function (#1489133)
- Fix connection to posgtres db using unix socket (#1489132)
- Fix handling of comma when adding contact from contacts widget (#1489107)
- Fix bug where a message was opened in both preview pane and new window on double-click (#1489122)
- Fix fatal error when xdebug.max_nesting_level was exceeded in rcube_washtml (#1489110)
- Fix PHP warning in html_table::set_row_attribs() in PHP 5.4 (#1489094)
- Fix invalid option selected in default_font selector when font is unset (#1489112)
- Fix displaying contact with ID divisible by 100 in sql addressbook (#1489121)
- Fix browser warnings on PDF plugin detection (#1489118)
- Fix fatal error when parsing UUencoded messages (#1489119)
@
text
@$NetBSD: patch-program_steps_mail_func.inc,v 1.1 2013/06/15 16:08:09 taca Exp $

Fix from repository:
* commit db108e37793c7f8fc8ba11f00d0561d1f0bd32c0:
  Fix another text wrapping issue (wrong handling of long unwrappable lines)
* commit f5fac810dd2b9276994585789cc68f71c4cd4cd3:
  Fix PHP warning when responding to a message with many Return-Path headers
  (#1489136)

--- program/steps/mail/func.inc.orig	2013-05-16 18:06:36.000000000 +0000
+++ program/steps/mail/func.inc
@@@@ -1532,11 +1532,11 @@@@ function rcmail_address_string($input, $
 /**
  * Wrap text to a given number of characters per line
  * but respect the mail quotation of replies messages (>).
- * Finally add another quotation level by prpending the lines
+ * Finally add another quotation level by prepending the lines
  * with >
  *
  * @@param string Text to wrap
- * @@param int The line width
+ * @@param int    The line width
  * @@return string The wrapped text
  */
 function rcmail_wrap_and_quote($text, $length = 72)
@@@@ -1552,7 +1552,7 @@@@ function rcmail_wrap_and_quote($text, $l
       $line = '>' . rtrim($line);
     else if (mb_strlen($line) > $max) {
       $newline = '';
-      foreach(explode("\n", rc_wordwrap($line, $length - 2)) as $l) {
+      foreach (explode("\n", rc_wordwrap($line, $length - 2)) as $l) {
         if (strlen($l))
           $newline .= '> ' . $l . "\n";
         else
@@@@ -1803,9 +1803,12 @@@@ function rcmail_identity_select($MESSAGE
     // Try Return-Path
     if ($from_idx === null && ($return_path = $MESSAGE->headers->others['return-path'])) {
         foreach ($identities as $idx => $ident) {
-            if (strpos($return_path, str_replace('@@', '=', $ident['email_ascii']).'@@') !== false) {
-                $from_idx = $idx;
-                break;
+            $ident = str_replace('@@', '=', $ident['email_ascii']) . '@@';
+            foreach ((array)$return_path as $path) {
+                if (strpos($path, $ident) !== false) {
+                    $from_idx = $idx;
+                    break 2;
+                }
             }
         }
     }
@


1.1
log
@Update roundcube to 0.9.1.
Changes are too any to write here and please refer CHANGELOG.

pkgsrc changes:
* Add note to enable access_compat_module Apache 2.3 or later.
* Make php-mcrypt mandatory.
* Clean up PKG_OPTIONS.
* Add several patches from official repository.
@
text
@d1 1
a1 1
$NetBSD$
@