From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 20 Apr 2019 00:58:30 +0000 (+0000)
Subject: Merge "rcfeed: Replace usage of deprecated CommentStore::getStore()"
X-Git-Tag: 1.34.0-rc.0~1916
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=844cb9eff3952efefc48e996e8c2d415a23791d8;hp=53ae2cb8aa49301c6848714c28406b5d14ae08ed

Merge "rcfeed: Replace usage of deprecated CommentStore::getStore()"
---

diff --git a/includes/rcfeed/IRCColourfulRCFeedFormatter.php b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
index 158ee5951f..ff85c90614 100644
--- a/includes/rcfeed/IRCColourfulRCFeedFormatter.php
+++ b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
@@ -19,6 +19,8 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * Generates a colourful notification intended for humans on IRC.
  *
@@ -93,8 +95,9 @@ class IRCColourfulRCFeedFormatter implements RCFeedFormatter {
 			) );
 			$flag = $attribs['rc_log_action'];
 		} else {
+			$store = MediaWikiServices::getInstance()->getCommentStore();
 			$comment = self::cleanupForIRC(
-				CommentStore::getStore()->getComment( 'rc_comment', $attribs )->text
+				$store->getComment( 'rc_comment', $attribs )->text
 			);
 			$flag = '';
 			if ( !$attribs['rc_patrolled']