dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "browser acceptance tests"
[lhc/web/wiklou.git]
/
includes
/
rcfeed
/
IRCColourfulRCFeedFormatter.php
diff --git
a/includes/rcfeed/IRCColourfulRCFeedFormatter.php
b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
index
22ddfb8
..
02a8d7e
100644
(file)
--- 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
$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;
}
$url .= $query;
}
@@
-77,15
+77,22
@@
class IRCColourfulRCFeedFormatter implements RCFeedFormatter {
if ( $attribs['rc_type'] == RC_LOG ) {
$targetText = $rc->getTitle()->getPrefixedText();
if ( $attribs['rc_type'] == RC_LOG ) {
$targetText = $rc->getTitle()->getPrefixedText();
- $comment = self::cleanupForIRC( str_replace( "[[$targetText]]", "[[\00302$targetText\00310]]", $actionComment ) );
+ $comment = self::cleanupForIRC( str_replace(
+ "[[$targetText]]",
+ "[[\00302$targetText\00310]]",
+ $actionComment
+ ) );
$flag = $attribs['rc_log_action'];
} else {
$comment = self::cleanupForIRC( $attribs['rc_comment'] );
$flag = '';
$flag = $attribs['rc_log_action'];
} else {
$comment = self::cleanupForIRC( $attribs['rc_comment'] );
$flag = '';
- if ( !$attribs['rc_patrolled'] && ( $wgUseRCPatrol || $attribs['rc_type'] == RC_NEW && $wgUseNPPatrol ) ) {
+ if ( !$attribs['rc_patrolled']
+ && ( $wgUseRCPatrol || $attribs['rc_type'] == RC_NEW && $wgUseNPPatrol )
+ ) {
$flag .= '!';
}
$flag .= '!';
}
- $flag .= ( $attribs['rc_type'] == RC_NEW ? "N" : "" ) . ( $attribs['rc_minor'] ? "M" : "" ) . ( $attribs['rc_bot'] ? "B" : "" );
+ $flag .= ( $attribs['rc_type'] == RC_NEW ? "N" : "" )
+ . ( $attribs['rc_minor'] ? "M" : "" ) . ( $attribs['rc_bot'] ? "B" : "" );
}
if ( $feed['add_interwiki_prefix'] === true && $wgLocalInterwikis ) {
}
if ( $feed['add_interwiki_prefix'] === true && $wgLocalInterwikis ) {