Merge "Move up devunt's name to Developers"

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

diff --git a/includes/rcfeed/IRCColourfulRCFeedFormatter.php b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
index 0efcebf..ddea695 100644 (file)
--- a/includes/rcfeed/IRCColourfulRCFeedFormatter.php
+++ b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
@@ -33,6 +33,11 @@ class IRCColourfulRCFeedFormatter implements RCFeedFormatter {
                global $wgUseRCPatrol, $wgUseNPPatrol, $wgLocalInterwikis,
                        $wgCanonicalServer, $wgScript;
                $attribs = $rc->getAttributes();
+               if ( $attribs['rc_type'] == RC_CATEGORIZE ) {
+                       // Don't send RC_CATEGORIZE events to IRC feed (T127360)
+                       return null;
+               }
+
                if ( $attribs['rc_type'] == RC_LOG ) {
                        // Don't use SpecialPage::getTitleFor, backwards compatibility with
                        // IRC API which expects "Log".
@@ -56,7 +61,7 @@ class IRCColourfulRCFeedFormatter implements RCFeedFormatter {
                                $query .= '&rcid=' . $attribs['rc_id'];
                        }
                        // HACK: We need this hook for WMF's secure server setup
-                       Hooks::run( 'IRCLineURL', array( &$url, &$query, $rc ) );
+                       Hooks::run( 'IRCLineURL', [ &$url, &$query, $rc ] );
                        $url .= $query;
                }
 
@@ -124,8 +129,8 @@ class IRCColourfulRCFeedFormatter implements RCFeedFormatter {
         */
        public static function cleanupForIRC( $text ) {
                return str_replace(
-                       array( "\n", "\r" ),
-                       array( " ", "" ),
+                       [ "\n", "\r" ],
+                       [ " ", "" ],
                        Sanitizer::decodeCharReferences( $text )
                );
        }