From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Mon, 27 Jul 2009 16:59:52 +0000 (+0000)
Subject: Fix shorten_utf8
X-Git-Tag: v3.0.0~607
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=fa7b86ca049ad5fdd84a9cb0fd25c7bedf142f5b;p=adminer.git

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 7f100231..547284cc 100644
--- 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>" : "");
 }