Merge "Fix sessionfailure i18n message during authentication"

[lhc/web/wiklou.git] / includes / rcfeed / IRCColourfulRCFeedFormatter.php

diff --git a/includes/rcfeed/IRCColourfulRCFeedFormatter.php b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
index 10ba83f..158ee59 100644 (file)
--- a/includes/rcfeed/IRCColourfulRCFeedFormatter.php
+++ b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
@@ -28,6 +28,10 @@
 class IRCColourfulRCFeedFormatter implements RCFeedFormatter {
        /**
         * @see RCFeedFormatter::getLine
+        * @param array $feed
+        * @param RecentChange $rc
+        * @param string|null $actionComment
+        * @return string|null
         */
        public function getLine( array $feed, RecentChange $rc, $actionComment ) {
                global $wgUseRCPatrol, $wgUseNPPatrol, $wgLocalInterwikis,
@@ -90,7 +94,7 @@ class IRCColourfulRCFeedFormatter implements RCFeedFormatter {
                        $flag = $attribs['rc_log_action'];
                } else {
                        $comment = self::cleanupForIRC(
-                               CommentStore::newKey( 'rc_comment' )->getComment( $attribs )->text
+                               CommentStore::getStore()->getComment( 'rc_comment', $attribs )->text
                        );
                        $flag = '';
                        if ( !$attribs['rc_patrolled']