jenkins-bot has submitted this change and it was merged.

Change subject: Update IRCLineURL hook to include RecentChange object
......................................................................


Update IRCLineURL hook to include RecentChange object

The Flow extension has need to change the url output by
the IRC formatter.  As a temporary fix this allows flow
to conditionally replace the url until RC can be adjusted
to inteligently generate URL's in a cross-extension way.

Change-Id: Ie951e52833a578fecd9423c2e6d3cc10816d7fef
---
M docs/hooks.txt
M includes/rcfeed/IRCColourfulRCFeedFormatter.php
2 files changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Matthias Mullie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docs/hooks.txt b/docs/hooks.txt
index e4037e6..3d1ba7e 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1441,6 +1441,7 @@
 Callee may modify $url and $query, URL will be constructed as $url . $query
 &$url: URL to index.php
 &$query: Query string
+$rc: RecentChange object that triggered url generation
 
 'IsFileCacheable': Override the result of Article::isFileCacheable() (if true)
 $article: article (object) being checked
diff --git a/includes/rcfeed/IRCColourfulRCFeedFormatter.php 
b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
index 22ddfb8..c2e5b03 100644
--- a/includes/rcfeed/IRCColourfulRCFeedFormatter.php
+++ b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
@@ -56,7 +56,7 @@
                                $query .= '&rcid=' . $attribs['rc_id'];
                        }
                        // HACK: We need this hook for WMF's secure server setup
-                       wfRunHooks( 'IRCLineURL', array( &$url, &$query ) );
+                       wfRunHooks( 'IRCLineURL', array( &$url, &$query, $rc ) 
);
                        $url .= $query;
                }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/120695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie951e52833a578fecd9423c2e6d3cc10816d7fef
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Bsitu <bs...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to