Minor, rare bug fix: Properly reduce multiple spaces in date headers

[squirrelmail.git] / functions / imap_messages.php

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index af21b55bbb7acaf04d46bfff92fb08ead144de1d..ad3e7863e7006c7c086ebd2768bfcdb88001e03c 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -710,7 +710,7 @@ function parseFetch(&$aResponse,$aMessageList = array()) {
             case 'BODYSTRUCTURE':
                 break; // to be implemented, moving imap code out of the Message class
             case 'INTERNALDATE':
-                $aMsg['INTERNALDATE'] = trim(str_replace('  ', ' ',parseString($read,$i)));
+                $aMsg['INTERNALDATE'] = trim(preg_replace('/\s+/', ' ',parseString($read,$i)));
                 break;
             case 'BODY.PEEK[HEADER.FIELDS':
             case 'BODY[HEADER.FIELDS':
@@ -731,7 +731,7 @@ function parseFetch(&$aResponse,$aMessageList = array()) {
                             $value = trim(substr($line, $pos+1));
                             switch($field) {
                                 case 'date':
-                                    $aMsg['date'] = trim(str_replace('  ', ' ', $value));
+                                    $aMsg['date'] = trim(preg_replace('/\s+/', ' ', $value));
                                     break;
                                 case 'x-priority': $aMsg['x-priority'] = ($value) ? (int) $value[0] : 3; break;
                                 case 'priority':