Merge branch 'master' of github.com:roundcube/roundcubemail

8 years ago · e13deb2e47
parent 930e363e55 d2d4f867e5
commit e13deb2e47
2 changed files with 5 additions and 2 deletions
--- a/program/lib/Roundcube/rcube_html2text.php
+++ b/program/lib/Roundcube/rcube_html2text.php
@ -234,7 +234,7 @@ class rcube_html2text
        '-',
        '*',
        '£',
-        'EUR',                                  // Euro sign. € ?
+        'EUR',                                  // Euro sign. €
        '|+|amp|+|',                            // Ampersand: see _converter()
        ' ',                                    // Runs of spaces, post-handling
    );
--- a/program/lib/Roundcube/rcube_image.php
+++ b/program/lib/Roundcube/rcube_image.php
@ -166,7 +166,10 @@ class rcube_image
                    else {
                        try {
                            $image = new Imagick($this->image_file);
-                            $image = $image->flattenImages();
+                            
+                            $image->setImageBackgroundColor('white');
+                            $image->setImageAlphaChannel(11);
+                            $image->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);

                            $image->setImageColorspace(Imagick::COLORSPACE_SRGB);
                            $image->setImageCompressionQuality(75);