Fix additional_message_headers plugin compatibility with Mail_Mime >= 1.9 (...

Aleksander Machniak

2016-02-09 89a49dd37085d6693b7d7b99d08711695ec88592

 plugins/additional_message_headers/additional_message_headers.php

@@ -24,22 +24,14 @@
    {
        $this->load_config();

        $headers = $args['message']->headers();
        $rcube   = rcube::get_instance();
        $rcube = rcube::get_instance();

        // additional email headers
        $additional_headers = $rcube->config->get('additional_message_headers', array());
        foreach ((array)$additional_headers as $header => $value) {
            if (null === $value) {
                unset($headers[$header]);
            }
            else {
                $headers[$header] = $value;
            }
        }

        $args['message']->_headers = array();
        $args['message']->headers($headers);
        if (!empty($additional_headers)) {
            $args['message']->headers($additional_headers, true);
        }

        return $args;
    }