Fix regression in converting signatures to text, fixed PHP warning in html2...

Aleksander Machniak

2015-08-30 c4daf3f14fa34bb78fe86410bfd79bd8951d7a71

Fix regression in converting signatures to text, fixed PHP warning in html2text() call

 program/include/rcmail.php

@@ -2305,7 +2305,7 @@
     *
     * @return string Plain text
     */
    public function html2text($html, $options)
    public function html2text($html, $options = array())
    {
        $default_options = array(
            'links'   => true,
@@ -2314,7 +2314,7 @@
            'charset' => RCUBE_CHARSET,
        );

        $options = array_merge($default_options, $options);
        $options = array_merge($default_options, (array) $options);

        // Plugins may want to modify HTML in another/additional way
        $options = $this->plugins->exec_hook('html2text', $options);

 program/steps/mail/compose.inc

@@ -499,7 +499,8 @@
                $text = $html = $sql_arr['signature'];

                if ($sql_arr['html_signature']) {
                    $text = $RCMAIL->html2text($html);
                    $text = $RCMAIL->html2text($html, array('links' => false));
                    $text = trim($text);
                }
                else {
                    $t2h  = new rcube_text2html($text, false);
@@ -1058,7 +1059,7 @@
            $suffix = '</blockquote>';
        }
        else {
            $suffix = '</blockquote><p></p>';
            $suffix = '</blockquote><p><br/></p>';
        }
    }