Support truncation of mulitbyte srings

This fixes https://sourceforge.net/p/phppgadmin/bugs/422/ :
substr truncates on a byte-level, sometimes within a multi-byte character. This resulted in the whole string sometime not being displayed. See the original bug report for a way to reproduce.

Please note that this requires php-mbstring to be installed. This is usually the case, but the dependency should be described in the INSTALL file or something.

diff --git a/classes/Misc.php b/classes/Misc.php
index 87a5eb6f6dee573a28e3714f5988c74a01119cd8..9939502e1d7ce0f21b894dd91197eea8d236521b 100644 (file)
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -261,8 +261,8 @@
                        if (isset($params['clip']) && $params['clip'] === true) {
                                $maxlen = isset($params['cliplen']) && is_integer($params['cliplen']) ? $params['cliplen'] : $conf['max_chars'];
                                $ellipsis = isset($params['ellipsis']) ? $params['ellipsis'] : $lang['strellipsis'];
-                               if (strlen($str) > $maxlen) {
-                                       $str = substr($str, 0, $maxlen-1) . $ellipsis;
+                               if (mb_strlen($str, 'UTF-8') > $maxlen) {
+                                       $str = mb_substr($str, 0, $maxlen-1, 'UTF-8') . $ellipsis;
                                }
                        }