- Applied fixes from trunk up to r5212

CHANGELOG

@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- jQuery 1.6.4
+- Fix handling of binary attachments encoded with quoted-printable (#1488065)
 - Fix text-overflow:ellipsis issues on messages list in FF7 and Webkit (#1488061)
 - Fix handling of links with IP address
 - Fix bug where message list filter was reset on folder compacting (#1488076)

program/include/rcube_imap.php

@@ -2491,6 +2491,9 @@ class rcube_imap
             return true;
         }
 
+        // Remove NULL characters (#1486189)
+        $body = str_replace("\x00", '', $body);
+
         // convert charset (if text or message part)
         if ($body && !$skip_charset_conv &&
             preg_match('/^(text|message)$/', $o_part->ctype_primary)

program/include/rcube_imap_generic.php

@@ -2387,8 +2387,6 @@ class rcube_imap_generic
                 } else if ($mode == 2) {
                     $line = rtrim($line, "\t\r\0\x0B");
                     $line = quoted_printable_decode($line);
-                    // Remove NULL characters (#1486189)
-                    $line = str_replace("\x00", '', $line);
                 // UUENCODE
                 } else if ($mode == 3) {
                     $line = rtrim($line, "\t\r\n\0\x0B");

program/include/rcube_ldap.php

@@ -685,8 +685,8 @@ class rcube_ldap extends rcube_addressbook
         } // end foreach
 
         // Verify that the required fields are set.
+        $missing = null;
         foreach ($this->prop['required_fields'] as $fld) {
-            $missing = null;
             if (!isset($newentry[$fld])) {
                 $missing[] = $fld;
             }

program/js/googiespell.js

@@ -193,7 +193,7 @@ this.getUrl = function() {
 };
 
 this.escapeSpecial = function(val) {
-    return val.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+    return val ? val.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;") : '';
 };
 
 this.createXMLReq = function (text) {

skins/default/mail.css

@@ -686,7 +686,6 @@ body.messagelist
   cursor: inherit;
 }
 
-#messagelist td span,
 #messagelist td img
 {
   vertical-align: middle;
@@ -704,6 +703,7 @@ body.messagelist
 #messagelist tr td.status span,
 #messagelist tr td.attachment span
 {
+  display: block;
   width: 15px;
 }
 
@@ -713,6 +713,7 @@ body.messagelist
 #messagelist tr td.attachment span.attachment,
 #messagelist tr td.attachment span.report,
 #messagelist tr td.flag span.flagged,
+#messagelist tr td.flag span.unflagged,
 #messagelist tr td.flag span.unflagged:hover,
 #messagelist tr td.status span.status,
 #messagelist tr td.status span.msgicon,
@@ -726,6 +727,7 @@ body.messagelist
 #messagelist tr td.subject span.forwarded,
 #messagelist tr td.subject span.unreadchildren
 {
+  display: inline-block;
   vertical-align: middle;
   height: 17px;
   width: 15px;
@@ -775,6 +777,7 @@ body.messagelist
 }
 
 #messagelist tr td.status span.msgicon,
+#messagelist tr td.flag span.unflagged,
 #messagelist tr td.status span.unreadchildren
 {
   background-position: 0 17px; /* no icon */
@@ -824,7 +827,7 @@ body.messagelist
 #messagelist tbody tr td.subject a
 {
   cursor: default;
-  vertical-align: middle;
+  vertical-align: middle; /* #1487091 */
 }
 
 /* thread parent message with unread children */