Fix another text wrap issue (added test case)

12 years ago · 2ce01932fe
parent cdb53ccb6a
commit 2ce01932fe
2 changed files with 6 additions and 2 deletions
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@ -659,8 +659,8 @@ class rcube_mime
                                $cutLength = $spacePos + 1;
                            }
                            else {
-                                $subString = $string;
-                                $cutLength = null;
+                                $subString = $substr_func($string, 0, $breakPos, $charset);
+                                $cutLength = $breakPos + 1;
                            }
                        }
                        else {
--- a/tests/Framework/Mime.php
+++ b/tests/Framework/Mime.php
@ -185,6 +185,10 @@ class Framework_Mime extends PHPUnit_Framework_TestCase
                array("----------------------------------------------------------------------------------------\nabc                        def123456789012345", 76),
                "----------------------------------------------------------------------------------------\nabc                        def123456789012345",
            ),
+            array(
+                array("-------\nabc def", 5),
+                "-------\nabc\ndef",
+            ),
        );

        foreach ($samples as $sample) {