fix for bug #552961, word wrapping problems.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2810 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/strings.php b/functions/strings.php
index c7c6060f4d2594bf1aa513f06d54583f0af9dc01..23d0dcc43cbedb89006cb6ece371cb1a7bd1440f 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -64,7 +64,7 @@ function sqWordWrap(&$line, $wrap) {
         
         /* Go to the next line if we have more to process */
         if ($i < count($words)) {
-            $line .= "\n" . $beginning_spaces;
+            $line .= "\n";
         }
     }
 }

diff --git a/src/compose.php b/src/compose.php
index 1816da87c48abe753adbca79fca7d194a983e668..aa3f5f7e3575c8a822b0b6152a60d897fff01ad0 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -153,8 +153,8 @@ if (isset($send)) {
             if (strlen($line) <= $editor_size + 1) {
                 $newBody .= $line . "\n";
             } else {
-                sqWordWrap($line, $editor_size) . "\n";
-                $newBody .= $line;
+                sqWordWrap($line, $editor_size);
+                $newBody .= $line . "\n";
             }
         }
         $body = $newBody;