X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Flogging%2FLogPage.php;h=af99940cb12f88fb75c91881acc0a4a1e5662bf1;hb=e68fdb4065a4822474f98f1c6bf2c77ef52e537b;hp=9f342646d10e15cc5d8775e476ca44174ba99788;hpb=5123888304ecb6f7f768fba569ec86ad79b344f1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index 9f342646d1..af99940cb1 100644
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -37,8 +37,8 @@ class LogPage {
 	const DELETED_RESTRICTED = 8;
 
 	// Convenience fields
-	const SUPPRESSED_USER = 12;
-	const SUPPRESSED_ACTION = 9;
+	const SUPPRESSED_USER = self::DELETED_USER | self::DELETED_RESTRICTED;
+	const SUPPRESSED_ACTION = self::DELETED_ACTION | self::DELETED_RESTRICTED;
 
 	/** @var bool */
 	public $updateRecentChanges;
@@ -223,10 +223,10 @@ class LogPage {
 	public static function actionText( $type, $action, $title = null, $skin = null,
 		$params = [], $filterWikilinks = false
 	) {
-		global $wgLang, $wgContLang, $wgLogActions;
+		global $wgLang, $wgLogActions;
 
 		if ( is_null( $skin ) ) {
-			$langObj = $wgContLang;
+			$langObj = MediaWikiServices::getInstance()->getContentLanguage();
 			$langObjOrNull = null;
 		} else {
 			$langObj = $wgLang;
@@ -294,9 +294,11 @@ class LogPage {
 			return $title->getPrefixedText();
 		}
 
-		$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+		$services = MediaWikiServices::getInstance();
+		$linkRenderer = $services->getLinkRenderer();
 		if ( $title->isSpecialPage() ) {
-			list( $name, $par ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
+			list( $name, $par ) = $services->getSpecialPageFactory()->
+				resolveAlias( $title->getDBkey() );
 
 			# Use the language name for log titles, rather than Log/X
 			if ( $name == 'Log' ) {