Use Horde_String::truncate()

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index cc39f44..c03ac33 100644 (file)
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -1488,8 +1488,8 @@ class IMP_Compose
         if ($attached == 1) {
             if (!($name = $headerob->getValue('subject'))) {
                 $name = _("[No Subject]");
-            } elseif (Horde_String::length($name) > 80) {
-                $name = Horde_String::substr($name, 0, 80) . '...';
+            } else {
+                $name = Horde_String::truncate($name, 80);
             }
             return 'Fwd: ' . $GLOBALS['imp_imap']->ob->utils->getBaseSubject($name, array('keepblob' => true));
         } else {

diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php
index 108e1cd..196f1f6 100644 (file)
--- a/imp/lib/Contents.php
+++ b/imp/lib/Contents.php
@@ -513,7 +513,7 @@ class IMP_Contents
         $this->_build = $oldbuild;
 
         if (Horde_String::length($ptext) > $maxlen) {
-            return array('cut' => true, 'text' => Horde_String::substr($ptext, 0, $maxlen) . ' ...');
+            return array('cut' => true, 'text' => Horde_String::truncate($ptext, $maxlen));
         }
 
         return array('cut' => false, 'text' => $ptext);