Index: trunk/phase3/languages/Language.php |
— | — | @@ -2788,7 +2788,7 @@ |
2789 | 2789 | * @param $l Array |
2790 | 2790 | * @return string |
2791 | 2791 | */ |
2792 | | - function listToText( $l ) { |
| 2792 | + function listToText( array $l ) { |
2793 | 2793 | $s = ''; |
2794 | 2794 | $m = count( $l ) - 1; |
2795 | 2795 | if ( $m == 1 ) { |
— | — | @@ -2813,13 +2813,13 @@ |
2814 | 2814 | * @param $list array of strings to put in a comma list |
2815 | 2815 | * @return string |
2816 | 2816 | */ |
2817 | | - function commaList( $list ) { |
2818 | | - return implode( |
2819 | | - $list, |
| 2817 | + function commaList( array $list ) { |
| 2818 | + return implode( |
2820 | 2819 | wfMsgExt( |
2821 | 2820 | 'comma-separator', |
2822 | 2821 | array( 'parsemag', 'escapenoentities', 'language' => $this ) |
2823 | | - ) |
| 2822 | + ), |
| 2823 | + $list |
2824 | 2824 | ); |
2825 | 2825 | } |
2826 | 2826 | |
— | — | @@ -2829,13 +2829,13 @@ |
2830 | 2830 | * @param $list array of strings to put in a semicolon list |
2831 | 2831 | * @return string |
2832 | 2832 | */ |
2833 | | - function semicolonList( $list ) { |
2834 | | - return implode( |
2835 | | - $list, |
| 2833 | + function semicolonList( array $list ) { |
| 2834 | + return implode( |
2836 | 2835 | wfMsgExt( |
2837 | 2836 | 'semicolon-separator', |
2838 | 2837 | array( 'parsemag', 'escapenoentities', 'language' => $this ) |
2839 | | - ) |
| 2838 | + ), |
| 2839 | + $list |
2840 | 2840 | ); |
2841 | 2841 | } |
2842 | 2842 | |
— | — | @@ -2844,13 +2844,13 @@ |
2845 | 2845 | * @param $list array of strings to put in a pipe list |
2846 | 2846 | * @return string |
2847 | 2847 | */ |
2848 | | - function pipeList( $list ) { |
2849 | | - return implode( |
2850 | | - $list, |
| 2848 | + function pipeList( array $list ) { |
| 2849 | + return implode( |
2851 | 2850 | wfMsgExt( |
2852 | 2851 | 'pipe-separator', |
2853 | 2852 | array( 'escapenoentities', 'language' => $this ) |
2854 | | - ) |
| 2853 | + ), |
| 2854 | + $list |
2855 | 2855 | ); |
2856 | 2856 | } |
2857 | 2857 | |