X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Flogging%2FRightsLogFormatter.php;h=c958947b0183b68dcb1bdc6d2894dce6e81e892a;hb=3715af91e2ce9244475c7f5fc777942269c6a18c;hp=8cdd2afb259d0e60332c78a70fe5ac5e4bf05af9;hpb=5123888304ecb6f7f768fba569ec86ad79b344f1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/logging/RightsLogFormatter.php b/includes/logging/RightsLogFormatter.php
index 8cdd2afb25..c958947b01 100644
--- a/includes/logging/RightsLogFormatter.php
+++ b/includes/logging/RightsLogFormatter.php
@@ -23,6 +23,8 @@
  * @since 1.22
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * This class formats rights log entries.
  *
@@ -30,10 +32,11 @@
  */
 class RightsLogFormatter extends LogFormatter {
 	protected function makePageLink( Title $title = null, $parameters = [], $html = null ) {
-		global $wgContLang, $wgUserrightsInterwikiDelimiter;
+		global $wgUserrightsInterwikiDelimiter;
 
 		if ( !$this->plaintext ) {
-			$text = $wgContLang->ucfirst( $title->getDBkey() );
+			$text = MediaWikiServices::getInstance()->getContentLanguage()->
+				ucfirst( $title->getDBkey() );
 			$parts = explode( $wgUserrightsInterwikiDelimiter, $text, 2 );
 
 			if ( count( $parts ) === 2 ) {
@@ -95,7 +98,7 @@ class RightsLogFormatter extends LogFormatter {
 
 		if ( count( $oldGroups ) ) {
 			$params[3] = [ 'raw' => $this->formatRightsList( $oldGroups,
-				isset( $allParams['oldmetadata'] ) ? $allParams['oldmetadata'] : [] ) ];
+				$allParams['oldmetadata'] ?? [] ) ];
 		} else {
 			$params[3] = $this->msg( 'rightsnone' )->text();
 		}
@@ -103,7 +106,7 @@ class RightsLogFormatter extends LogFormatter {
 			// Array_values is used here because of T44211
 			// see use of array_unique in UserrightsPage::doSaveUserGroups on $newGroups.
 			$params[4] = [ 'raw' => $this->formatRightsList( array_values( $newGroups ),
-				isset( $allParams['newmetadata'] ) ? $allParams['newmetadata'] : [] ) ];
+				$allParams['newmetadata'] ?? [] ) ];
 		} else {
 			$params[4] = $this->msg( 'rightsnone' )->text();
 		}
@@ -181,8 +184,7 @@ class RightsLogFormatter extends LogFormatter {
 				if ( isset( $oldmetadata[$index] ) ) {
 					$result += $oldmetadata[$index];
 				}
-				$result['expiry'] = ApiResult::formatExpiry( isset( $result['expiry'] ) ?
-					$result['expiry'] : null );
+				$result['expiry'] = ApiResult::formatExpiry( $result['expiry'] ?? null );
 
 				return $result;
 			}, array_keys( $params['4:array:oldgroups'] ) );
@@ -199,8 +201,7 @@ class RightsLogFormatter extends LogFormatter {
 				if ( isset( $newmetadata[$index] ) ) {
 					$result += $newmetadata[$index];
 				}
-				$result['expiry'] = ApiResult::formatExpiry( isset( $result['expiry'] ) ?
-					$result['expiry'] : null );
+				$result['expiry'] = ApiResult::formatExpiry( $result['expiry'] ?? null );
 
 				return $result;
 			}, array_keys( $params['5:array:newgroups'] ) );