Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(follow-up r84660) Per comments, make truncate return original string instead of ellipsis if string is smaller then length and ellipsis is not.

Browse source
This commit is contained in:
Brian Wolff 2011-03-24 03:39:21 +00:00
parent bdeaa960dd
commit 7eb1053ee4
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
languages/Language.php
View file

@ -2395,10 +2395,15 @@ class Language {
}
$eLength = $adjustLength ? strlen( $ellipsis ) : 0;
# Check if there is no need to truncate
if ( $length == 0 || strlen( $ellipsis ) >= abs( $length ) ) {
if ( $length == 0 ) {
return $ellipsis;
} elseif ( strlen( $string ) <= abs( $length ) ) {
return $string;
} elseif ( strlen( $ellipsis ) >= abs( $length ) ) {
// Not combined with first (length == 0) if statement, since
// we want to return the string instead of ellipsis if both
// this and the proceeding elseif are true.
return $ellipsis;
}
$stringOriginal = $string;
if ( $length > 0 ) {