Merge branch 'develop' of projects.ceondo.com:indefero into feature.scilab

Conflicts:
	NEWS.mdtext
This commit is contained in:
Thomas Keller
2012-03-22 00:51:39 +01:00
12 changed files with 120 additions and 163 deletions

View File

@@ -512,12 +512,12 @@ function IDF_Views_Source_PrettySizeSimple($size)
function IDF_Views_Source_ShortenString($string, $length)
{
$ellipse = "...";
$length = max(strlen($ellipse) + 2, $length);
$length = max(mb_strlen($ellipse) + 2, $length);
$preflen = ceil($length / 10);
if (mb_strlen($string) < $length)
return $string;
return substr($string, 0, $preflen).$ellipse.
substr($string, -($length - $preflen - mb_strlen($ellipse)));
return mb_substr($string, 0, $preflen).$ellipse.
mb_substr($string, -($length - $preflen - mb_strlen($ellipse)));
}