Updated smarty

[gosa.git] / include / smarty / plugins / modifier.truncate.php

diff --git a/include/smarty/plugins/modifier.truncate.php b/include/smarty/plugins/modifier.truncate.php
index d96de5f12397bffa4769000c3ae9a09be39cb843..35c89690a1556cc6dfa943bde00f40abb43dca15 100644 (file)
--- a/include/smarty/plugins/modifier.truncate.php
+++ b/include/smarty/plugins/modifier.truncate.php
@@ -31,12 +31,12 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...',
         return '';
 
     if (strlen($string) > $length) {
-        $length -= strlen($etc);
+        $length -= min($length, strlen($etc));
         if (!$break_words && !$middle) {
             $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length+1));
         }
         if(!$middle) {
-            return substr($string, 0, $length).$etc;
+            return substr($string, 0, $length) . $etc;
         } else {
             return substr($string, 0, $length/2) . $etc . substr($string, -$length/2);
         }