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

Making listToText() not break if passed a 1-item list.

Browse source 
Change-Id: I25f36d25a106e2e024d4de334b0396f95792d72b
This commit is contained in:
Kaldari 2012-07-17 13:37:17 -07:00
parent ef3132fb0d
commit e476f5f432
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
languages/Language.php
View file

@ -2996,6 +2996,7 @@ class Language {
* Take a list of strings and build a locale-friendly comma-separated
* list, using the local comma-separator message.
* The last two strings are chained with an "and".
* NOTE: This function will only work with standard numeric array keys (0, 1, 2…)
*
* @param $l Array
* @return string
@ -3003,7 +3004,10 @@ class Language {
function listToText( array $l ) {
$s = '';
$m = count( $l ) - 1;
if ( $m == 1 ) {
if ( $m === 0 ) {
return $l[0];
} elseif ( $m === 1 ) {
return $l[0] . $this->getMessageFromDB( 'and' ) . $this->getMessageFromDB( 'word-separator' ) . $l[1];
} else {
for ( $i = $m; $i >= 0; $i-- ) {