jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392088 )
Change subject: Fix FlaggedRevision query
......................................................................
Fix FlaggedRevision query
It was missing needed join conditions.
Change-Id: I45b8c05b6564891c0c5c73ad1cf9ae48e627b2a5
---
M backend/FlaggedRevision.php
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index 0f86629..a536739 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -175,12 +175,13 @@
$frQuery['fields'],
[
'fp_page_id' => $pageId,
- 'fr_rev_id = fp_stable',
$db->bitAnd( 'rev_deleted',
Revision::DELETED_TEXT ) . ' = 0', // sanity
],
__METHOD__,
$options,
- $frQuery['joins']
+ [
+ 'flaggedrevs' => [ 'JOIN', 'fr_rev_id =
fp_stable' ],
+ ] + $frQuery['joins']
);
if ( $row ) {
$frev = new self( $row );
@@ -448,7 +449,7 @@
'rev_id = fr_rev_id',
'rev_page = fr_page_id', // sanity
] ],
- ],
+ ] + $revQuery['joins'],
];
}
--
To view, visit https://gerrit.wikimedia.org/r/392088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45b8c05b6564891c0c5c73ad1cf9ae48e627b2a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
