X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=blobdiff_plain;f=languages%2FLanguage.php;h=ea34363b4f85f722d99f9a811680cb1925d4dc71;hb=525f157e17c0bfaf65ea90e47a88b873bd17c576;hp=392fcbafb4ef3c7b52301e0827e5c7a39e64aa9e;hpb=86b54375de7eb767221b785ba724adaa58cd6d51;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/Language.php b/languages/Language.php
index 392fcbafb4..ea34363b4f 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -32,7 +32,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 
 # Read language names
 global $wgLanguageNames;
-require_once( __DIR__ . '/Names.php' );
+require_once __DIR__ . '/Names.php';
 
 if ( function_exists( 'mb_strtoupper' ) ) {
 	mb_internal_encoding( 'UTF-8' );
@@ -386,7 +386,7 @@ class Language {
 		static $coreLanguageNames;
 
 		if ( $coreLanguageNames === null ) {
-			include( MWInit::compiledPath( 'languages/Names.php' ) );
+			include MWInit::compiledPath( 'languages/Names.php' );
 		}
 
 		if ( isset( $coreLanguageNames[$tag] )
@@ -423,7 +423,7 @@ class Language {
 		}
 
 		if ( file_exists( "$IP/languages/classes/$class.php" ) ) {
-			include_once( "$IP/languages/classes/$class.php" );
+			include_once "$IP/languages/classes/$class.php";
 		}
 	}
 
@@ -857,7 +857,7 @@ class Language {
 		static $coreLanguageNames;
 
 		if ( $coreLanguageNames === null ) {
-			include( MWInit::compiledPath( 'languages/Names.php' ) );
+			include MWInit::compiledPath( 'languages/Names.php' );
 		}
 
 		$names = array();
@@ -3605,10 +3605,6 @@ class Language {
 	 * @return string Correct form of plural for $count in this language
 	 */
 	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) {
-			return '';
-		}
-
 		// Handle explicit n=pluralform cases
 		foreach ( $forms as $index => $form ) {
 			if ( preg_match( '/\d+=/i', $form ) ) {
@@ -3619,7 +3615,11 @@ class Language {
 				unset( $forms[$index] );
 			}
 		}
+
 		$forms = array_values( $forms );
+		if ( !count( $forms ) ) {
+			return '';
+		}
 
 		$pluralForm = $this->getPluralRuleIndexNumber( $count );
 		$pluralForm = min( $pluralForm, count( $forms ) - 1 );