From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Tue, 11 May 2010 22:54:03 +0000 (+0000)
Subject: * support GENDER in 'siteuser'
X-Git-Tag: 1.31.0-rc.0~36882
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=b06c8703b6e941f8d91144c2807c38775a5bd56f;p=lhc%2Fweb%2Fwiklou.git

* support GENDER in 'siteuser'
* update formatting here and there
---

diff --git a/includes/Credits.php b/includes/Credits.php
index 7fe2253ac4..53718cb0bc 100644
--- a/includes/Credits.php
+++ b/includes/Credits.php
@@ -119,14 +119,18 @@ class Credits {
 			$cnt--;
 			if ( $user->isLoggedIn() ) {
 				$link = self::link( $user );
-				if ( !in_array( 'realname', $wgHiddenPrefs ) && $user->getRealName() )
+				if ( !in_array( 'realname', $wgHiddenPrefs ) && $user->getRealName() ) {
 					$real_names[] = $link;
-				else
+				} else {
 					$user_names[] = $link;
+				}
 			} else {
 				$anon_ips[] = self::link( $user );
 			}
-			if ( $cnt == 0 ) break;
+
+			if ( $cnt == 0 ) {
+				break;
+			}
 		}
 
 		if ( count( $real_names ) ) {
@@ -137,15 +141,21 @@ class Credits {
 
 		# "ThisSite user(s) A, B and C"
 		if ( count( $user_names ) ) {
-			$user = wfMsgExt( 'siteusers', array( 'parsemag' ),
-				$wgLang->listToText( $user_names ), count( $user_names ) );
+			$user = wfMsgExt(
+				'siteusers',
+				'parsemag',
+				$wgLang->listToText( $user_names ), count( $user_names )
+			);
 		} else {
 			$user = false;
 		}
 
 		if ( count( $anon_ips ) ) {
-			$anon = wfMsgExt( 'anonusers', array( 'parsemag' ),
-				$wgLang->listToText( $anon_ips ), count( $anon_ips ) );
+			$anon = wfMsgExt(
+				'anonusers',
+				'parsemag',
+				$wgLang->listToText( $anon_ips ), count( $anon_ips )
+			);
 		} else {
 			$anon = false;
 		}
@@ -174,10 +184,11 @@ class Credits {
 	 */
 	protected static function link( User $user ) {
 		global $wgUser, $wgHiddenPrefs;
-		if ( !in_array( 'realname', $wgHiddenPrefs ) && !$user->isAnon() )
+		if ( !in_array( 'realname', $wgHiddenPrefs ) && !$user->isAnon() ) {
 			$real = $user->getRealName();
-		else
+		} else {
 			$real = false;
+		}
 
 		$skin = $wgUser->getSkin();
 		$page = $user->isAnon() ?
@@ -198,10 +209,11 @@ class Credits {
 			return wfMsgExt( 'anonuser', array( 'parseinline', 'replaceafter' ), $link );
 		} else {
 			global $wgHiddenPrefs;
-			if ( !in_array( 'realname', $wgHiddenPrefs ) && $user->getRealName() )
+			if ( !in_array( 'realname', $wgHiddenPrefs ) && $user->getRealName() ) {
 				return $link;
-			else
-				return wfMsgExt( 'siteuser', array( 'parseinline', 'replaceafter' ), $link );
+			} else {
+				return wfMsgExt( 'siteuser', 'parsemag', $link, $user->getName() );
+			}
 		}
 	}