Fix shorten_utf8

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@920 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 7f10023120e607ea1279b83c82e916848614b104..547284ccffbc9fd258c62c4d982e6d0bd967462f 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -251,7 +251,7 @@ function is_utf8($val) {
 }
 
 function shorten_utf8($string, $length = 80, $suffix = "") {
-       preg_match("~^(.{0,$length})(.?)~su", $string, $match);
+       preg_match("~^((?:.|\n){0,$length})(.|\n)?~u", $string, $match); // ~s causes trash in $match[2] under some PHP versions
        return htmlspecialchars($match[1]) . $suffix . ($match[2] ? "<em>...</em>" : "");
 }