Fix regresion that caused double charset conversion in some messages (#1490...

Aleksander Machniak

2014-10-28 68c41f1dff4ec94ffa78ef772cd1bcd3f8d2d9a0

Fix regresion that caused double charset conversion in some messages (#1490121)

 program/lib/Roundcube/rcube_message.php

@@ -263,17 +263,18 @@
        $this->storage->set_folder($this->folder);

        $body = $this->storage->get_message_part($this->uid, $mime_id, $part,
            $mode === -1, is_resource($mode) ? $mode : null, !$formatted, $max_bytes, $formatted);

        if (!$mode && $body && $formatted) {
            $body = self::format_part_body($body, $part, $this->headers->charset);
        }
            $mode === -1, is_resource($mode) ? $mode : null,
            !($mode && $formatted), $max_bytes, $mode && $formatted);

        if (is_resource($mode)) {
            rewind($mode);
            return $body !== false;
        }

        if (!$mode && $body && $formatted) {
            $body = self::format_part_body($body, $part, $this->headers->charset);
        }

        return $body;
    }