From 557b2cf3ef1cf81b97c6937144d43492f06e88c3 Mon Sep 17 00:00:00 2001 From: withoutaname Date: Wed, 30 Jul 2014 20:55:30 -0700 Subject: [PATCH] Remove various functions and globals deprecated since 1.22 from RecentChange Change-Id: I5200892e75ffa894133e2e386d53c09536547de9 --- RELEASE-NOTES-1.24 | 4 ++ includes/DefaultSettings.php | 45 --------------- includes/Setup.php | 9 --- includes/changes/RecentChange.php | 93 ------------------------------- includes/rcfeed/RCFeedEngine.php | 2 +- 5 files changed, 5 insertions(+), 148 deletions(-) diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index 8952863cc1..df3eac127d 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -49,6 +49,8 @@ production. now always sorted. * Users must be able to edit a page to be able to delete it. * $wgHTCPMulticastAddress, $wgHTCPMulticastRouting and $wgHTCPPort were removed. +* $wgRC2UDPAddress, $wgRC2UDPInterwikiPrefix, $wgRC2UDPOmitBots, $wgRC2UDPPort + and $wgRC2UDPPrefix have been removed. === New features in 1.24 === * Added a new hook, "WhatLinksHereProps", to allow extensions to annotate @@ -320,6 +322,8 @@ changes to languages because of Bugzilla reports. existed purely to provide support for MSIE versions below 7 and which was conditionally loaded for those browsers, was also removed. * Action::checkCanExecute() no longer has a return value. +* Removed cleanupForIRC(), loadFromCurRow(), newFromCurRow(), notifyRC2UDP() + and sendToUDP() from RecentChange.php. (deprecated since 1.22) ==== Renamed classes ==== * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index cb8325c323..39e3212bff 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -5681,48 +5681,6 @@ $wgRCLinkLimits = array( 50, 100, 250, 500 ); */ $wgRCLinkDays = array( 1, 3, 7, 14, 30 ); -/** - * Send recent changes updates via UDP. The updates will be formatted for IRC. - * Set this to the IP address of the receiver. - * - * @deprecated since 1.22, use $wgRCFeeds - */ -$wgRC2UDPAddress = false; - -/** - * Port number for RC updates - * - * @deprecated since 1.22, use $wgRCFeeds - */ -$wgRC2UDPPort = false; - -/** - * Prefix to prepend to each UDP packet. - * This can be used to identify the wiki. A script is available called - * mxircecho.py which listens on a UDP port, and uses a prefix ending in a - * tab to identify the IRC channel to send the log line to. - * - * @deprecated since 1.22, use $wgRCFeeds - */ -$wgRC2UDPPrefix = ''; - -/** - * If this is set to true, the first entry in the $wgLocalInterwikis array (or - * the value of $wgLocalInterwiki, if set) will be prepended to links in the IRC - * feed. If this is set to a string, that string will be used as the prefix. - * - * @deprecated since 1.22, use $wgRCFeeds - */ -$wgRC2UDPInterwikiPrefix = false; - -/** - * Set to true to omit "bot" edits (by users with the bot permission) from the - * UDP feed. - * - * @deprecated since 1.22, use $wgRCFeeds - */ -$wgRC2UDPOmitBots = false; - /** * Destinations to which notifications about recent changes * should be sent. @@ -5750,9 +5708,6 @@ $wgRC2UDPOmitBots = false; * The JSON-specific options are: * * 'channel' -- if set, the 'channel' parameter is also set in JSON values. * - * To ensure backwards-compatibility, whenever $wgRC2UDPAddress is set, a - * 'default' feed will be created reusing the deprecated $wgRC2UDP* variables. - * * @example $wgRCFeeds['example'] = array( * 'formatter' => 'JSONRCFeedFormatter', * 'uri' => "udp://localhost:1336", diff --git a/includes/Setup.php b/includes/Setup.php index a4b98778b4..dfdac343c0 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -392,15 +392,6 @@ if ( $wgCookieSecure === 'detect' ) { $wgCookieSecure = ( WebRequest::detectProtocol() === 'https' ); } -if ( $wgRC2UDPAddress ) { - $wgRCFeeds['default'] = array( - 'formatter' => 'IRCColourfulRCFeedFormatter', - 'uri' => "udp://$wgRC2UDPAddress:$wgRC2UDPPort/$wgRC2UDPPrefix", - 'add_interwiki_prefix' => &$wgRC2UDPInterwikiPrefix, - 'omit_bots' => &$wgRC2UDPOmitBots, - ); -} - wfProfileOut( $fname . '-defaults' ); // Disable MWDebug for command line mode, this prevents MWDebug from eating up diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php index cfebf409fe..1f5ffd8f34 100644 --- a/includes/changes/RecentChange.php +++ b/includes/changes/RecentChange.php @@ -160,22 +160,6 @@ class RecentChange { return $type; } - /** - * No uses left in Gerrit on 2013-11-19. - * @deprecated since 1.22 - * @param mixed $row - * @return RecentChange - */ - public static function newFromCurRow( $row ) { - wfDeprecated( __METHOD__, '1.22' ); - $rc = new RecentChange; - $rc->loadFromCurRow( $row ); - $rc->notificationtimestamp = false; - $rc->numberofWatchingusers = false; - - return $rc; - } - /** * Obtain the recent change with a given rc_id value * @@ -350,38 +334,6 @@ class RecentChange { } } - /** - * @deprecated since 1.22, use notifyRCFeeds instead. - */ - public function notifyRC2UDP() { - wfDeprecated( __METHOD__, '1.22' ); - $this->notifyRCFeeds(); - } - - /** - * Send some text to UDP. - * @deprecated since 1.22 - */ - public static function sendToUDP( $line, $address = '', $prefix = '', $port = '' ) { - global $wgRC2UDPAddress, $wgRC2UDPInterwikiPrefix, $wgRC2UDPPort, $wgRC2UDPPrefix; - - wfDeprecated( __METHOD__, '1.22' ); - - # Assume default for standard RC case - $address = $address ? $address : $wgRC2UDPAddress; - $prefix = $prefix ? $prefix : $wgRC2UDPPrefix; - $port = $port ? $port : $wgRC2UDPPort; - - $engine = new UDPRCFeedEngine(); - $feed = array( - 'uri' => "udp://$address:$port/$prefix", - 'formatter' => 'IRCColourfulRCFeedFormatter', - 'add_interwiki_prefix' => $wgRC2UDPInterwikiPrefix, - ); - - $engine->send( $feed, $line ); - } - /** * Notify all the feeds about the change. * @param array $feeds Optional feeds to send to, defaults to $wgRCFeeds @@ -452,15 +404,6 @@ class RecentChange { return new $wgRCEngines[$scheme]; } - /** - * @deprecated since 1.22, moved to IRCColourfulRCFeedFormatter - */ - public static function cleanupForIRC( $text ) { - wfDeprecated( __METHOD__, '1.22' ); - - return IRCColourfulRCFeedFormatter::cleanupForIRC( $text ); - } - /** * Mark a given change as patrolled * @@ -793,42 +736,6 @@ class RecentChange { $this->mAttribs['rc_deleted'] = $row->rc_deleted; // MUST be set } - /** - * Makes a pseudo-RC entry from a cur row - * - * @deprecated since 1.22 - * @param mixed $row - */ - public function loadFromCurRow( $row ) { - wfDeprecated( __METHOD__, '1.22' ); - $this->mAttribs = array( - 'rc_timestamp' => wfTimestamp( TS_MW, $row->rev_timestamp ), - 'rc_user' => $row->rev_user, - 'rc_user_text' => $row->rev_user_text, - 'rc_namespace' => $row->page_namespace, - 'rc_title' => $row->page_title, - 'rc_comment' => $row->rev_comment, - 'rc_minor' => $row->rev_minor_edit ? 1 : 0, - 'rc_type' => $row->page_is_new ? RC_NEW : RC_EDIT, - 'rc_source' => $row->page_is_new ? self::SRC_NEW : self::SRC_EDIT, - 'rc_cur_id' => $row->page_id, - 'rc_this_oldid' => $row->rev_id, - 'rc_last_oldid' => isset( $row->rc_last_oldid ) ? $row->rc_last_oldid : 0, - 'rc_bot' => 0, - 'rc_ip' => '', - 'rc_id' => $row->rc_id, - 'rc_patrolled' => $row->rc_patrolled, - 'rc_new' => $row->page_is_new, # obsolete - 'rc_old_len' => $row->rc_old_len, - 'rc_new_len' => $row->rc_new_len, - 'rc_params' => isset( $row->rc_params ) ? $row->rc_params : '', - 'rc_log_type' => isset( $row->rc_log_type ) ? $row->rc_log_type : null, - 'rc_log_action' => isset( $row->rc_log_action ) ? $row->rc_log_action : null, - 'rc_logid' => isset( $row->rc_logid ) ? $row->rc_logid : 0, - 'rc_deleted' => $row->rc_deleted // MUST be set - ); - } - /** * Get an attribute value * diff --git a/includes/rcfeed/RCFeedEngine.php b/includes/rcfeed/RCFeedEngine.php index 768dd7f038..0b0cd86951 100644 --- a/includes/rcfeed/RCFeedEngine.php +++ b/includes/rcfeed/RCFeedEngine.php @@ -28,7 +28,7 @@ interface RCFeedEngine { /** * Sends some text to the specified live feed. * - * @see RecentChange::cleanupForIRC + * @see IRCColourfulRCFeedFormatter::cleanupForIRC * @param array $feed The feed, as configured in an associative array * @param string $line The text to send * @return bool Success -- 2.20.1