From d044ae0534800c41f1e8c1e875408cadc9a6a967 Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Fri, 6 Feb 2009 15:31:53 +0000 Subject: [PATCH] Simplify shorten_utf8 git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@554 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- functions.inc.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/functions.inc.php b/functions.inc.php index 5991b637a..4b7888a7f 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -323,18 +323,8 @@ function select($result) { } function shorten_utf8($string, $length) { - for ($i=0; $i < strlen($string); $i++) { - if (ord($string[$i]) >= 192) { - while (ord($string[$i+1]) >= 128 && ord($string[$i+1]) < 192) { - $i++; - } - } - $length--; - if ($length == 0) { - return nl2br(htmlspecialchars(substr($string, 0, $i+1))) . "..."; - } - } - return nl2br(htmlspecialchars($string)); + preg_match("~^(.{0,$length})(.?)~su", $string, $match); + return nl2br(htmlspecialchars($match[1])) . ($match[2] ? "..." : ""); } function table_comment(&$row) {