Changeset 83 for img

Timestamp:

03/19/10 00:37:49 (6 months ago)

Author:

daniel

Message:

- Fixed: wordwrap_utf8 works now as expected

Files:

• img/trunk/lib/functions.php (modified) (1 diff)

img/trunk/lib/functions.php

@@ -215 +215 @@
 {
         $str =  preg_split('/([\x20\r\n\t]++|\xc2\xa0)/sSX', $str, -1, PREG_SPLIT_NO_EMPTY);
-        $len = 0;
         $return = '';
         foreach ($str as $val) {
-                $val .= ' ';
-                $tmp = mb_strlen($val, 'utf-8');
-                $len += $tmp;
-                if ($len >= $width) {
-                        $return .= $break . $val;
-                        $len = $tmp;
-                } else
-                        $return .= $val;
-        }
-        return $return;
+                do {
+                        $return .= mb_substr($val, 0, $width, 'utf-8');
+                        if (mb_strlen($val, 'utf-8') > $width) $return .= $break;
+                        $val = mb_substr($val, $width, mb_strlen($val, 'utf-8') - $width);
+                } while ($val != '');
+                $return .= ' ';
+        }
+        return mb_substr($return, 0, -1, 'utf-8');
 }