jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341110 )
Change subject: Update SimpleChanges for RC filters changes
......................................................................
Update SimpleChanges for RC filters changes
Bug: T152754
Change-Id: I3711f3f822e488cb3a888d339bda06f5361fdfec
Depends-On: Iec2d82f6a830403d1c948a280efa58992e0cdee7
---
M SpecialSimpleChanges.php
1 file changed, 6 insertions(+), 12 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialSimpleChanges.php b/SpecialSimpleChanges.php
index 87c93ba..0c41802 100644
--- a/SpecialSimpleChanges.php
+++ b/SpecialSimpleChanges.php
@@ -11,20 +11,15 @@
* @global array $wgContentNamespaces
* @global bool $wgSimpleChangesOnlyContentNamespaces
* @global bool $wgSimpleChangesOnlyLatest
- * @param array $tables
- * @param array $fields
- * @param array $conds
- * @param array $query_options
- * @param array $join_conds
- * @param FormOptions $opts
- * @return bool True if no handler aborted the hook
+ *
+ * @inheritdoc
*/
- protected function runMainQueryHook( &$tables, &$fields, &$conds,
&$query_options, &$join_conds,
- $opts
- ) {
+ protected function buildQuery( &$tables, &$fields, &$conds,
+ &$query_options, &$join_conds, FormOptions $opts ) {
+
global $wgContentNamespaces,
$wgSimpleChangesOnlyContentNamespaces, $wgSimpleChangesOnlyLatest;
- $conds = parent::buildMainQueryConds( $opts );
+ parent::buildQuery( $tables, $fields, $conds, $query_options,
$join_conds, $opts );
# don't count log entries toward limit of number of changes
displayed
$conds[] = 'rc_type != ' . RC_LOG;
@@ -50,7 +45,6 @@
$join_conds['page'] = array( 'LEFT JOIN',
'rc_cur_id=page_id' );
}
}
- return parent::runMainQueryHook( $tables, $fields, $conds,
$query_options, $join_conds, $opts );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/341110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3711f3f822e488cb3a888d339bda06f5361fdfec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SimpleChanges
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
