diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /includes/rcfeed | |
parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'includes/rcfeed')
-rw-r--r-- | includes/rcfeed/MachineReadableRCFeedFormatter.php | 4 | ||||
-rw-r--r-- | includes/rcfeed/RCFeedFormatter.php | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/includes/rcfeed/MachineReadableRCFeedFormatter.php b/includes/rcfeed/MachineReadableRCFeedFormatter.php index 519606ca..f524361a 100644 --- a/includes/rcfeed/MachineReadableRCFeedFormatter.php +++ b/includes/rcfeed/MachineReadableRCFeedFormatter.php @@ -90,9 +90,7 @@ abstract class MachineReadableRCFeedFormatter implements RCFeedFormatter { $packet['log_type'] = $rc->getAttribute( 'rc_log_type' ); $packet['log_action'] = $rc->getAttribute( 'rc_log_action' ); if ( $rc->getAttribute( 'rc_params' ) ) { - wfSuppressWarnings(); - $params = unserialize( $rc->getAttribute( 'rc_params' ) ); - wfRestoreWarnings(); + $params = $rc->parseParams(); if ( // If it's an actual serialised false... $rc->getAttribute( 'rc_params' ) == serialize( false ) || diff --git a/includes/rcfeed/RCFeedFormatter.php b/includes/rcfeed/RCFeedFormatter.php index 2f156598..f7e62ee6 100644 --- a/includes/rcfeed/RCFeedFormatter.php +++ b/includes/rcfeed/RCFeedFormatter.php @@ -32,7 +32,8 @@ interface RCFeedFormatter { * @param RecentChange $rc The RecentChange object showing what sort * of event has taken place. * @param string|null $actionComment - * @return string The text to send. + * @return string|null The text to send. If the formatter returns null, + * the line will not be sent. */ public function getLine( array $feed, RecentChange $rc, $actionComment ); } |