- Workaround for setting charset in case of malformed bodystructure respons...

alecpl

2011-01-17 824144214f82b4f00a82ac688a9adea7386c1bd0

- Workaround for setting charset in case of malformed bodystructure response (#1487700)

 CHANGELOG

@@ -4,6 +4,7 @@
- Fix login redirect issues (#1487686)
- Require PHP 5.2.1 or greater
- Fix %h/%z variables in username_domain option (#1487701)
- Workaround for setting charset in case of malformed bodystructure response (#1487700)

RELEASE 0.5
-----------

 program/include/rcube_imap.php

@@ -2053,7 +2053,7 @@
                return false;
        }

        $struct = &$this->_structure_part($structure);
        $struct = &$this->_structure_part($structure, 0, '', $headers);
        $struct->headers = get_object_vars($headers);

        // don't trust given content-type
@@ -2185,6 +2185,11 @@
                $struct->charset = $struct->ctype_parameters['charset'];
        }

        // #1487700: workaround for lack of charset in malformed structure
        if (empty($struct->charset) && !empty($mime_headers) && $mime_headers->charset) {
            $struct->charset = $mime_headers->charset;
        }

        // read content encoding
        if (!empty($part[5]) && $part[5]!='NIL') {
            $struct->encoding = strtolower($part[5]);