| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -2178,12 +2178,7 @@ |
| 2179 | 2179 | # We chopped in the middle of a character; remove it |
| 2180 | 2180 | $string = $m[1]; |
| 2181 | 2181 | } |
| 2182 | | - # Do not truncate if the ellipsis actually make the string longer. Bug 22181 |
| 2183 | | - if ( strlen( $string ) + strlen( $ellipsis ) < strlen( $stringOriginal ) ) { |
| 2184 | | - return $string . $ellipsis; |
| 2185 | | - } else { |
| 2186 | | - return $stringOriginal; |
| 2187 | | - } |
| | 2182 | + $string = $string . $ellipsis; |
| 2188 | 2183 | |
| 2189 | 2184 | } else { |
| 2190 | 2185 | $string = substr( $string, $length ); |
| — | — | @@ -2192,13 +2187,14 @@ |
| 2193 | 2188 | # We chopped in the middle of a character; remove the whole thing |
| 2194 | 2189 | $string = preg_replace( '/^[\x80-\xbf]+/', '', $string ); |
| 2195 | 2190 | } |
| 2196 | | - # Do not truncate if the ellipsis actually make the string longer. Bug 22181 |
| 2197 | | - if ( strlen( $string ) + strlen( $ellipsis ) < strlen( $stringOriginal ) ) { |
| 2198 | | - return $ellipsis . $string; |
| 2199 | | - } else { |
| 2200 | | - return $stringOriginal; |
| 2201 | | - } |
| | 2191 | + $string = $ellipsis . $string; |
| 2202 | 2192 | } |
| | 2193 | + # Do not truncate if the ellipsis actually make the string longer. Bug 22181 |
| | 2194 | + if ( strlen( $string ) < strlen( $stringOriginal ) ) { |
| | 2195 | + return $string; |
| | 2196 | + } else { |
| | 2197 | + return $stringOriginal; |
| | 2198 | + } |
| 2203 | 2199 | } |
| 2204 | 2200 | |
| 2205 | 2201 | /** |