diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /includes/rcfeed | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/rcfeed')
| -rw-r--r-- | includes/rcfeed/IRCColourfulRCFeedFormatter.php | 2 | ||||
| -rw-r--r-- | includes/rcfeed/UDPRCFeedEngine.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/includes/rcfeed/IRCColourfulRCFeedFormatter.php b/includes/rcfeed/IRCColourfulRCFeedFormatter.php index 02a8d7eb..30be3431 100644 --- a/includes/rcfeed/IRCColourfulRCFeedFormatter.php +++ b/includes/rcfeed/IRCColourfulRCFeedFormatter.php @@ -56,7 +56,7 @@ class IRCColourfulRCFeedFormatter implements RCFeedFormatter { $query .= '&rcid=' . $attribs['rc_id']; } // HACK: We need this hook for WMF's secure server setup - wfRunHooks( 'IRCLineURL', array( &$url, &$query, $rc ) ); + Hooks::run( 'IRCLineURL', array( &$url, &$query, $rc ) ); $url .= $query; } diff --git a/includes/rcfeed/UDPRCFeedEngine.php b/includes/rcfeed/UDPRCFeedEngine.php index 8554670e..9afae661 100644 --- a/includes/rcfeed/UDPRCFeedEngine.php +++ b/includes/rcfeed/UDPRCFeedEngine.php @@ -29,6 +29,7 @@ class UDPRCFeedEngine implements RCFeedEngine { * @see RCFeedEngine::send */ public function send( array $feed, $line ) { - wfErrorLog( $line, $feed['uri'] ); + $transport = UDPTransport::newFromString( $feed['uri'] ); + $transport->emit( $line ); } } |