Bring back additional_message_headers compatibility with Mail_Mime < 1.9

Aleksander Machniak

2016-02-09 f915d15c43d9dc2cdf3e23e4bd943b55399a69af

Bring back additional_message_headers compatibility with Mail_Mime < 1.9

 plugins/additional_message_headers/additional_message_headers.php

@@ -30,7 +30,25 @@
        $additional_headers = $rcube->config->get('additional_message_headers', array());

        if (!empty($additional_headers)) {
            $args['message']->headers($additional_headers, true);
            // Mail_mime >= 1.9.0
            if (method_exists($message, 'isMultipart')) {
                $args['message']->headers($additional_headers, true);
            }
            else {
                $headers = $args['message']->headers();

                foreach ((array) $additional_headers as $header => $value) {
                    if ($value === null) {
                        unset($headers[$header]);
                    }
                    else {
                        $headers[$header] = $value;
                    }
                }

                $args['message']->_headers = array();
                $args['message']->headers($headers);
            }
        }

        return $args;